Merge pull request #529 from rm420/fix/multifilters_for_bq

Enables multi-filtering for big-query.
getredash · Aug 16, 2015 · 3ef3f2c · 3ef3f2c
2 parents 5f38e87 + 371422a
commit 3ef3f2c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js
@@ -198,8 +198,8 @@
         var yValues = {};
 
         _.each(row, function (value, definition) {
-          var name = definition.split("::")[0];
-          var type = definition.split("::")[1];
+          var name = definition.split("::")[0] || definition.split("__")[0];
+          var type = definition.split("::")[1] || definition.split("__")[0];
           if (mapping) {
             type = mapping[definition];
           }
@@ -224,7 +224,7 @@
             seriesName = String(value);
           }
 
-          if (type == 'multi-filter') {
+          if (type == 'multiFilter' || type == 'multi-filter') {
             seriesName = String(value);
           }
         });
@@ -322,7 +322,7 @@
 
     QueryResult.prototype.prepareFilters = function () {
       var filters = [];
-      var filterTypes = ['filter', 'multi-filter'];
+      var filterTypes = ['filter', 'multi-filter', 'multiFilter'];
       _.each(this.getColumnNames(), function (col) {
         var type = col.split('::')[1] || col.split('__')[1];
         if (_.contains(filterTypes, type)) {
@@ -331,7 +331,7 @@
             name: col,
             friendlyName: this.getColumnFriendlyName(col),
             values: [],
-            multiple: (type=='multi-filter')
+            multiple: (type=='multiFilter') || (type=='multi-filter')
           }
           filters.push(filter);
         }