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

Merge branch 'release_3.0.0' of github.com:ansible/ansible-tower into JobDetailHostEvents

Browse Source
This commit is contained in:
Akita Noek
2016-06-01 15:06:11 -04:00
parent 37a7e0a862 5fd216f786
commit 3b1639da4f
7 changed files with 9 additions and 6 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) {
if (type.value === notification_template.notification_type) {
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.password_required = false;
obj.channel_required = false;
obj.room_required = false;
switch (type) {
case 'email':
obj.portLabel = ' Port';