Prevent empty submit of the query builder filters from wiping the form.

NREL · Feb 20, 2015 · 67a98b0 · 67a98b0
1 parent 99edddc
commit 67a98b0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/app/assets/javascripts/admin/views/stats/query_form_view.js b/app/assets/javascripts/admin/views/stats/query_form_view.js
@@ -218,7 +218,10 @@ Admin.StatsQueryFormView = Ember.View.extend({
     }
 
     if(rules) {
-      $queryBuilder.queryBuilder('setRules', rules);
+      if(rules.condition) {
+        $queryBuilder.queryBuilder('setRules', rules);
+      }
+
       this.send('toggleFilters');
       this.send('toggleFilterType', 'builder');
     } else if(this.get('controller.query.params.search')) {
@@ -234,7 +237,7 @@ Admin.StatsQueryFormView = Ember.View.extend({
       rules = JSON.parse(query);
     }
 
-    if(rules) {
+    if(rules && rules.condition) {
       $('#query_builder').queryBuilder('setRules', rules);
     } else {
       $('#query_builder').queryBuilder('reset');