Просмотр исходного кода

Graphite: Fix for nonNegativeDerivative function, now possible to not include optional first parameter maxValue, Closes #702

Torkel Ödegaard 11 лет назад
Родитель
Сommit
cb479d737b

+ 1 - 0
CHANGELOG.md

@@ -21,6 +21,7 @@
 - [Issue #696](https://github.com/grafana/grafana/issues/696). Graph: Fix for y-axis format 'none' when values are in scientific notation (ex 2.3e-13)
 - [Issue #696](https://github.com/grafana/grafana/issues/696). Graph: Fix for y-axis format 'none' when values are in scientific notation (ex 2.3e-13)
 - [Issue #733](https://github.com/grafana/grafana/issues/733). Graph: Fix for tooltip current value decimal precision when 'none' axis format was selected
 - [Issue #733](https://github.com/grafana/grafana/issues/733). Graph: Fix for tooltip current value decimal precision when 'none' axis format was selected
 - [Issue #697](https://github.com/grafana/grafana/issues/697). Graphite: Fix for Glob syntax in graphite queries ([1-9] and ?) that made the query editor / parser bail and fallback to a text box.
 - [Issue #697](https://github.com/grafana/grafana/issues/697). Graphite: Fix for Glob syntax in graphite queries ([1-9] and ?) that made the query editor / parser bail and fallback to a text box.
+- [Issue #702](https://github.com/grafana/grafana/issues/702). Graphite: Fix for nonNegativeDerivative function, now possible to not include optional first parameter maxValue
 - [Issue #277](https://github.com/grafana/grafana/issues/277). Dashboard: Fix for timepicker date & tooltip when UTC timezone selected.
 - [Issue #277](https://github.com/grafana/grafana/issues/277). Dashboard: Fix for timepicker date & tooltip when UTC timezone selected.
 - [Issue #699](https://github.com/grafana/grafana/issues/699). Dashboard: Fix for bug when adding rows from dashboard settings dialog.
 - [Issue #699](https://github.com/grafana/grafana/issues/699). Dashboard: Fix for bug when adding rows from dashboard settings dialog.
 - [Issue #723](https://github.com/grafana/grafana/issues/723). Dashboard: Fix for hide controls setting not used/initialized on dashboard load
 - [Issue #723](https://github.com/grafana/grafana/issues/723). Dashboard: Fix for hide controls setting not used/initialized on dashboard load

+ 2 - 2
src/app/directives/graphiteFuncEditor.js

@@ -147,7 +147,7 @@ function (angular, _, $) {
             $funcLink.appendTo(elem);
             $funcLink.appendTo(elem);
 
 
             _.each(funcDef.params, function(param, index) {
             _.each(funcDef.params, function(param, index) {
-              if (param.optional && !func.params[index]) {
+              if (param.optional && func.params.length !== index + 1) {
                 return;
                 return;
               }
               }
 
 
@@ -239,4 +239,4 @@ function (angular, _, $) {
 
 
     });
     });
 
 
-});
+});

+ 0 - 4
src/app/services/dashboard/dashboardViewStateSrv.js

@@ -21,10 +21,6 @@ function (angular, _, $) {
         }
         }
       };
       };
 
 
-      $scope.onAppEvent('dashboard-saved', function() {
-        self.update({ fullscreen: false });
-      });
-
       $scope.onAppEvent('$routeUpdate', function() {
       $scope.onAppEvent('$routeUpdate', function() {
         var urlState = self.getQueryStringState();
         var urlState = self.getQueryStringState();
         if (self.needsSync(urlState)) {
         if (self.needsSync(urlState)) {

+ 2 - 2
src/app/services/graphite/gfunc.js

@@ -280,8 +280,8 @@ function (_) {
   addFuncDef({
   addFuncDef({
     name: 'nonNegativeDerivative',
     name: 'nonNegativeDerivative',
     category: categories.Transform,
     category: categories.Transform,
-    params: [{ name: "max value or 0", type: "int", }],
-    defaultParams: [0]
+    params: [{ name: "max value or 0", type: "int", optional: true }],
+    defaultParams: ['']
   });
   });
 
 
   addFuncDef({
   addFuncDef({