Skip to content

Commit

Permalink
Fix for merge string as array (apache#2597)
Browse files Browse the repository at this point in the history
  • Loading branch information
songyanho authored and mistercrunch committed Apr 12, 2017
1 parent 31283f1 commit c93411b
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions superset/assets/javascripts/dashboard/Dashboard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,12 @@ export function dashboardContainer(dashboard, datasources) {
if (!(sliceId in this.filters)) {
this.filters[sliceId] = {};
}
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 (!(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 (refresh) {
this.refreshExcept(sliceId);
Expand Down

0 comments on commit c93411b

Please sign in to comment.