Fix problem where form validation failed for alarms with notifications
This commit is contained in:
parent
2462e2b571
commit
12adc5057f
@ -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,
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user