From beca72cc40bb211ff1d4d5731a562d5640cf13f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 20 May 2014 16:18:24 +0200
Subject: [PATCH] filterSrv refactoring cleanup and testing

---
 src/app/panels/filtering/module.html |  2 +-
 src/app/services/filterSrv.js        | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/app/panels/filtering/module.html b/src/app/panels/filtering/module.html
index 950390b8107..96b5751ce7d 100644
--- a/src/app/panels/filtering/module.html
+++ b/src/app/panels/filtering/module.html
@@ -2,7 +2,7 @@
 
   <div class='filtering-container'>
 
-    <div ng-repeat="filter in filter.list" class="small filter-panel-filter">
+    <div ng-repeat="filter in filter.templateParameters" class="small filter-panel-filter">
       <div>
         <i class="filter-action pointer icon-remove" bs-tooltip="'Remove'" ng-click="remove(filter)"></i>
         <i class="filter-action pointer icon-edit" ng-hide="filter.editing" bs-tooltip="'Edit'" ng-click="filter.editing = true"></i>
diff --git a/src/app/services/filterSrv.js b/src/app/services/filterSrv.js
index 3d882354cbd..4273535d9bd 100644
--- a/src/app/services/filterSrv.js
+++ b/src/app/services/filterSrv.js
@@ -16,7 +16,7 @@ define([
     };
 
     var result = {
-        _updateTemplateData : function( initial ) {
+        _updateTemplateData : function(initial) {
             var _templateData = {};
             _.each(this.templateParameters, function( templateParameter ) {
                 if (initial) {
@@ -29,7 +29,7 @@ define([
                     return;
                 }
 
-                _templateData[ templateParameter.name ] = templateParameter.current.value;
+                _templateData[templateParameter.name] = templateParameter.current.value;
             });
             this._templateData = _templateData;
         },
@@ -92,17 +92,19 @@ define([
             this.templateParameters = _.without( this.templateParameters, templateParameter );
         },
 
-        init : function( dashboard ) {
+        init: function(dashboard) {
             _.defaults(this, _d);
             this.dashboard = dashboard;
             this.templateSettings = { interpolate : /\[\[([\s\S]+?)\]\]/g };
-            if( dashboard && dashboard.services && dashboard.services.filter ) {
-                // compatiblity hack
+
+            if(dashboard.services && dashboard.services.filter) {
                 this.time = dashboard.services.filter.time;
+                this.templateParameters = dashboard.services.filter.list || [];
+                this._updateTemplateData(true);
             }
 
         }
-    }; 
+    };
     return result;
   });