Merge pull request getredash#1793 from danielerapati/fix/alert_with_n…

…o_query_result safeguard alerts against empty query results
karthikrk1 · Jun 28, 2017 · bf17bdc · bf17bdc
2 parents 70292c8 + 23cb92c
commit bf17bdc
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/redash/models.py b/redash/models.py
@@ -1150,18 +1150,20 @@ def to_dict(self, full=True):
 
     def evaluate(self):
         data = json.loads(self.query_rel.latest_query_data.data)
-        # todo: safe guard for empty
-        value = data['rows'][0][self.options['column']]
-        op = self.options['op']
-
-        if op == 'greater than' and value > self.options['value']:
-            new_state = self.TRIGGERED_STATE
-        elif op == 'less than' and value < self.options['value']:
-            new_state = self.TRIGGERED_STATE
-        elif op == 'equals' and value == self.options['value']:
-            new_state = self.TRIGGERED_STATE
+        if data['rows']:
+            value = data['rows'][0][self.options['column']]
+            op = self.options['op']
+
+            if op == 'greater than' and value > self.options['value']:
+                new_state = self.TRIGGERED_STATE
+            elif op == 'less than' and value < self.options['value']:
+                new_state = self.TRIGGERED_STATE
+            elif op == 'equals' and value == self.options['value']:
+                new_state = self.TRIGGERED_STATE
+            else:
+                new_state = self.OK_STATE
         else:
-            new_state = self.OK_STATE
+            new_state = self.UNKNOWN_STATE
 
         return new_state