From afdc19ce9d04f7a1e1c03b96b450b4dde15602f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 3 Sep 2014 07:35:14 +0200
Subject: [PATCH] Updated sumSeries, averageSeries to support other series
 reference arguments, #117

---
 src/app/services/graphite/gfunc.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/app/services/graphite/gfunc.js b/src/app/services/graphite/gfunc.js
index 7015ef74929..c8c4dea3ae6 100644
--- a/src/app/services/graphite/gfunc.js
+++ b/src/app/services/graphite/gfunc.js
@@ -24,6 +24,15 @@ function (_) {
     index[funcDef.shortName || funcDef.name] = funcDef;
   }
 
+  var optionalSeriesRefArgs = [
+    { name: 'other', type: 'value_or_series', optional: true },
+    { name: 'other', type: 'value_or_series', optional: true },
+    { name: 'other', type: 'value_or_series', optional: true },
+    { name: 'other', type: 'value_or_series', optional: true },
+    { name: 'other', type: 'value_or_series', optional: true }
+  ];
+
+
   addFuncDef({
     name: 'scaleToSeconds',
     category: categories.Transform,
@@ -59,22 +68,14 @@ function (_) {
 
   addFuncDef({
     name: 'diffSeries',
-    params: [
-      { name: 'other', type: 'value_or_series', optional: true },
-      { name: 'other', type: 'value_or_series', optional: true },
-      { name: 'other', type: 'value_or_series', optional: true }
-    ],
-    defaultParams: ['$B'],
+    params: optionalSeriesRefArgs,
+    defaultParams: ['#B'],
     category: categories.Calculate,
   });
 
   addFuncDef({
     name: 'asPercent',
-    params: [
-      { name: 'other', type: 'value_or_series', optional: true },
-      { name: 'other', type: 'value_or_series', optional: true },
-      { name: 'other', type: 'value_or_series', optional: true }
-    ],
+    params: optionalSeriesRefArgs,
     defaultParams: ['#A'],
     category: categories.Calculate,
   });
@@ -83,12 +84,16 @@ function (_) {
     name: 'sumSeries',
     shortName: 'sum',
     category: categories.Combine,
+    params: optionalSeriesRefArgs,
+    defaultParams: [''],
   });
 
   addFuncDef({
     name: 'averageSeries',
     shortName: 'avg',
     category: categories.Combine,
+    params: optionalSeriesRefArgs,
+    defaultParams: [''],
   });
 
   addFuncDef({