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

Merge pull request #16105 from grafana/graphite-fix-0-arg

Browse Source 
Graphite: fixed nonNegativeDerivative argument hidden if 0
This commit is contained in:
Torkel Ödegaard 2019-03-20 18:18:47 +01:00 committed by GitHub
commit 3884ac855e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/datasource/graphite/func_editor.ts
View File

@ -183,8 +183,9 @@ export function graphiteFuncEditor($compile, templateSrv, popoverSrv) {
} }
let paramValue = templateSrv.highlightVariablesAsHtml(func.params[index]); let paramValue = templateSrv.highlightVariablesAsHtml(func.params[index]);
const hasValue = paramValue !== null && paramValue !== undefined;
const last = index >= func.params.length - 1 && param.optional && !paramValue; const last = index >= func.params.length - 1 && param.optional && !hasValue;
if (last && param.multiple) { if (last && param.multiple) {
paramValue = '+'; paramValue = '+';
} }
@ -197,7 +198,7 @@ export function graphiteFuncEditor($compile, templateSrv, popoverSrv) {
'<a ng-click="" class="graphite-func-param-link' + '<a ng-click="" class="graphite-func-param-link' +
(last ? ' query-part__last' : '') + (last ? ' query-part__last' : '') +
'">' + '">' +
(paramValue || '&nbsp;') + (hasValue ? paramValue : '&nbsp;') +
'</a>' '</a>'
); );
const $input = $(paramTemplate); const $input = $(paramTemplate);