Revert "Fix for merge string as array (apache#2597)"

This reverts commit c93411b.
ascott · Apr 14, 2017 · 6115d6e · 6115d6e
1 parent c43a9fd
commit 6115d6e
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/superset/assets/javascripts/dashboard/Dashboard.jsx b/superset/assets/javascripts/dashboard/Dashboard.jsx
@@ -190,12 +190,10 @@ export function dashboardContainer(dashboard, datasources) {
       if (!(sliceId in this.filters)) {
         this.filters[sliceId] = {};
       }
-      if (!(col in this.filters[sliceId])) {
-        if (!merge) {
-          this.filters[sliceId][col] = vals;
-        } else {
-          this.filters[sliceId][col] = d3.merge([this.filters[sliceId][col], vals]);
-        }
+      if (!(col in this.filters[sliceId]) || !merge) {
+        this.filters[sliceId][col] = vals;
+      } else {
+        this.filters[sliceId][col] = d3.merge([this.filters[sliceId][col], vals]);
       }
       if (refresh) {
         this.refreshExcept(sliceId);