Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
bf110d02
Commit
bf110d02
authored
Aug 28, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: form dropdown, escape autocomplete dropdown items, fixes #9089
parent
e91cf28f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
public/app/core/components/form_dropdown/form_dropdown.ts
+3
-1
public/app/plugins/datasource/elasticsearch/query_def.js
+1
-1
No files found.
public/app/core/components/form_dropdown/form_dropdown.ts
View file @
bf110d02
...
@@ -115,7 +115,9 @@ export class FormDropdownCtrl {
...
@@ -115,7 +115,9 @@ export class FormDropdownCtrl {
this
.
optionCache
=
options
;
this
.
optionCache
=
options
;
// extract texts
// extract texts
let
optionTexts
=
_
.
map
(
options
,
'text'
);
let
optionTexts
=
_
.
map
(
options
,
op
=>
{
return
_
.
escape
(
op
.
text
);
});
// add custom values
// add custom values
if
(
this
.
allowCustom
)
{
if
(
this
.
allowCustom
)
{
...
...
public/app/plugins/datasource/elasticsearch/query_def.js
View file @
bf110d02
...
@@ -29,7 +29,7 @@ function (_) {
...
@@ -29,7 +29,7 @@ function (_) {
orderByOptions
:
[
orderByOptions
:
[
{
text
:
"Doc Count"
,
value
:
'_count'
},
{
text
:
"Doc Count"
,
value
:
'_count'
},
{
text
:
"Term value"
,
value
:
'_term'
},
{
text
:
"Term value
<script>alert('hello')</script>
"
,
value
:
'_term'
},
],
],
orderOptions
:
[
orderOptions
:
[
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment