alert create including filters

rowers/alerts.py

@@ -12,7 +12,7 @@ def create_alert(manager, rower, measured,period=7, emailalert=True,
     # check if manager is coach of rower. If not return 0
     if manager.rower != rower:
         if rower not in coach_getcoachees(manager.rower):
-            return 0
+            return 0,'You are not allowed to create this alert'
     
     m = Condition(
         metric = measured['metric'],
@@ -36,7 +36,8 @@ def create_alert(manager, rower, measured,period=7, emailalert=True,
     alert.save()
 
     if 'filter' in kwargs:
-        for f in filter:
+        filters = kwargs['filter']
+        for f in filters:
             m = Condition(
                 metric = f['metric'],
                 value1 = f['value1'],
@@ -49,7 +50,7 @@ def create_alert(manager, rower, measured,period=7, emailalert=True,
             alert.filter.add(m)
 
 
-    return m.id
+    return alert.id,'Your alert was created'
 
 
 
@@ -71,7 +72,7 @@ def alert_add_filters(alert,filter):
 
         alert.filter.add(m)
         
-        
+    return 1
 
 # get alert stats
 # nperiod = 0: current period, i.e. next_run - n days to today