From 12adc5057f8df3963d9617e54ac7b184df8a6f14 Mon Sep 17 00:00:00 2001
From: Rob Raymond <rob.raymond@hp.com>
Date: Thu, 19 Jun 2014 18:05:06 -0600
Subject: [PATCH] Fix problem where form validation failed for alarms with
 notifications

---
 monitoring/alarms/forms.py | 6 +++---
 monitoring/alarms/views.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/monitoring/alarms/forms.py b/monitoring/alarms/forms.py
index a2144c94..01a15835 100644
--- a/monitoring/alarms/forms.py
+++ b/monitoring/alarms/forms.py
@@ -167,7 +167,7 @@ class NotificationCreateWidget(forms.Select):
             notification_id = "%s_%d" % (name, i)
             if notification_id in data:
                 if len(data[notification_id]) > 0:
-                    notifications.append({"notification_id":
+                    notifications.append({"id":
                                          data[notification_id]})
             else:
                 break
@@ -272,7 +272,7 @@ class CreateAlarmForm(BaseAlarmForm):
 
     def handle(self, request, data):
         try:
-            alarm_actions = [notification.get('notification_id')
+            alarm_actions = [notification.get('id')
                              for notification in data['notifications']]
             api.monitor.alarm_create(
                 request,
@@ -309,7 +309,7 @@ class EditAlarmForm(BaseAlarmForm):
         try:
             alarm_actions = []
             if data['notifications']:
-                alarm_actions = [notification.get('notification_id')
+                alarm_actions = [notification.get('id')
                                  for notification in data['notifications']]
             api.monitor.alarm_update(
                 request,
diff --git a/monitoring/alarms/views.py b/monitoring/alarms/views.py
index 0af3d72d..26d723ce 100644
--- a/monitoring/alarms/views.py
+++ b/monitoring/alarms/views.py
@@ -268,7 +268,7 @@ class AlarmDetailView(forms.ModalFormView):
             self._object["notifications"] = notifications
             return self._object
         except Exception:
-            redirect = reverse(constants.URL_PREFIX + 'alarm')
+            redirect = self.get_success_url()
             exceptions.handle(self.request,
                               _('Unable to retrieve alarm details.'),
                               redirect=redirect)
@@ -285,7 +285,7 @@ class AlarmDetailView(forms.ModalFormView):
         return context
 
     def get_success_url(self):
-        return "d"
+        return reverse_lazy(constants.URL_PREFIX + 'index')
 
 
 class AlarmEditView(forms.ModalFormView):
@@ -321,7 +321,7 @@ class AlarmEditView(forms.ModalFormView):
             self._object["notifications"] = notifications
             return self._object
         except Exception:
-            redirect = reverse(constants.URL_PREFIX + 'alarm')
+            redirect = self.get_success_url()
             exceptions.handle(self.request,
                               _('Unable to retrieve alarm details.'),
                               redirect=redirect)