diff --git a/awx/ui/client/src/notifications/notification-templates-list/list.controller.js b/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
index ec6574afb7..c62050cdb4 100644
--- a/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
+++ b/awx/ui/client/src/notifications/notification-templates-list/list.controller.js
@@ -153,8 +153,10 @@ export default
.then(function (data) {
if(data && data.data && data.data.notification){
Wait('start');
+ // Using a setTimeout here to wait for the
+ // notification to be processed and for a status
+ // to be returned from the API.
setTimeout(function(){
- console.log('in set timeout');
var id = data.data.notification,
url = GetBasePath('notifications') + id;
Rest.setUrl(url);
@@ -163,19 +165,24 @@ export default
Wait('stop');
if(res && res.data && res.data.status && res.data.status === "successful"){
ngToast.success({
- content: ` ${name}: Notification Succeeded.`,
- dismissOnTimeout: false
+ content: ` ${name}: Notification sent.`
});
}
else if(res && res.data && res.data.status && res.data.status === "failed"){
ngToast.danger({
- content: ` ${name}: Notification Failed.`,
- dismissOnTimeout: false
+ content: ` ${name}: Notification failed.`
});
}
+ else {
+ ProcessErrors(scope, data, status, null, { hdr: 'Error!',
+ msg: 'Call to ' + url + ' failed. Notification returned status: ' + status });
+ }
});
} , 5000);
-
+ }
+ else {
+ ProcessErrors(scope, data, status, null, { hdr: 'Error!',
+ msg: 'Call to notifcatin templates failed. Notification returned status: ' + status });
}
})
.catch(function () {
diff --git a/awx/ui/client/src/notifications/notifications.block.less b/awx/ui/client/src/notifications/notifications.block.less
index d3ebf96651..eb767b5230 100644
--- a/awx/ui/client/src/notifications/notifications.block.less
+++ b/awx/ui/client/src/notifications/notifications.block.less
@@ -13,6 +13,11 @@
color: @default-bg;
}
+.alert-danger{
+ background-color: @default-err;
+ color: @default-bg;
+}
+
.Toast-successIcon{
font-size: x-large;
vertical-align: middle;