IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed issue in metric segment and option lookup, #6912

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-12-14 10:50:48 +01:00
parent 38d8ba8faa
commit faf6a5fd36
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/core/services/segment_srv.js
View File

@@ -23,6 +23,9 @@ function (angular, _, coreModule) {
return;
}
// temp hack to work around legacy inconsistency in segment model
this.text = options.value;
this.cssClass = options.cssClass;
this.custom = options.custom;
this.type = options.type;
@@ -79,7 +82,7 @@ function (angular, _, coreModule) {
this.transformToSegments = function(addTemplateVars, variableTypeFilter) {
return function(results) {
var segments = _.map(results, function(segment) {
return self.newSegment({ value: segment.text, expandable: segment.expandable });
return self.newSegment({value: segment.text, expandable: segment.expandable});
});
if (addTemplateVars) {

2
public/app/plugins/datasource/graphite/query_ctrl.ts
View File

@@ -161,7 +161,7 @@ export class GraphiteQueryCtrl extends QueryCtrl {
return this.datasource.metricFindQuery(query).then(segments => {
var altSegments = _.map(segments, segment => {
return this.uiSegmentSrv.newSegment({ value: segment.text, expandable: segment.expandable });
return this.uiSegmentSrv.newSegment({value: segment.text, expandable: segment.expandable});
});
if (altSegments.length === 0) { return altSegments; }