IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

adhocfilters: minor escape change

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-04-07 10:08:16 +02:00
parent 7e14797b10
commit 7ec6e84fe8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/templating/adhoc_variable.ts
+2 -2
View File
@@ -67,11 +67,11 @@ export class AdhocVariable implements Variable {
}
escapeDelimiter(value) {
return value.replace('|', '__gfpipe');
return value.replace('|', '__gfp__');
}
unescapeDelimiter(value) {
return value.replace('__gfpipe', '|');
return value.replace('__gfp__', '|');
}
setFilters(filters: any[]) {
public/app/features/templating/specs/adhoc_variable_specs.ts
+2 -2
View File
@@ -15,7 +15,7 @@ describe('AdhocVariable', function() {
]
});
var urlValue = variable.getValueForUrl();
expect(urlValue).to.eql(["key1|=|value1", "key2|!=|value2", "key3|=|value3a__gfpipevalue3b"]);
expect(urlValue).to.eql(["key1|=|value1", "key2|!=|value2", "key3|=|value3a__gfp__value3b"]);
});
});
@@ -24,7 +24,7 @@ describe('AdhocVariable', function() {
it('should restore filters', function() {
var variable = new AdhocVariable({});
variable.setValueFromUrl(["key1|=|value1", "key2|!=|value2", "key3|=|value3a__gfpipevalue3b"]);
variable.setValueFromUrl(["key1|=|value1", "key2|!=|value2", "key3|=|value3a__gfp__value3b"]);
expect(variable.filters[0].key).to.be('key1');
expect(variable.filters[0].operator).to.be('=');