External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-22 13:36:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fixed empty notification status as well as an issue with the form which prevented you from creating a notification due to a rogue required field.

Browse Source
This commit is contained in:
Michael Abashian
2016-06-01 14:41:44 -04:00
parent 79cbd68a13
commit 2196b03330
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/notifications/notification-templates-list/list.controller.js
View File

@@ -31,7 +31,8 @@ export default
scope.notification_type_options.forEach(function(type) { scope.notification_type_options.forEach(function(type) {
if (type.value === notification_template.notification_type) { if (type.value === notification_template.notification_type) {
scope.notification_templates[i].notification_type = type.label; scope.notification_templates[i].notification_type = type.label;
scope.notification_templates[i].status = notification_template.summary_fields.recent_notifications[0].status; var recent_notifications = notification_template.summary_fields.recent_notifications;
scope.notification_templates[i].status = recent_notifications && recent_notifications.length > 0 ? recent_notifications[0].status : "none";
} }
}); });
}); });

1
awx/ui/client/src/notifications/shared/type-change.service.js
View File

@@ -21,6 +21,7 @@ function () {
obj.port_required = false; obj.port_required = false;
obj.password_required = false; obj.password_required = false;
obj.channel_required = false; obj.channel_required = false;
obj.room_required = false;
switch (type) { switch (type) {
case 'email': case 'email':
obj.portLabel = ' Port'; obj.portLabel = ' Port';