shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Code Releases Activity

Addressed PR Issues

Browse Source
This commit is contained in:
Alex Corey 2019-06-20 14:39:13 -04:00
parent a7c787af02
commit b0249a9a8b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/client/src/notifications/shared/notification-list-init.factory.js
View File

@ -49,7 +49,7 @@ export default ['Wait', 'GetBasePath', 'ProcessErrors', 'Rest', 'GetChoices',
scope.relatednotificationsRemove(); scope.relatednotificationsRemove();
} }
scope.relatednotificationsRemove = scope.$on('relatednotifications', function () { scope.relatednotificationsRemove = scope.$on('relatednotifications', function () {
var columns = ['/notification_templates_started/', '/notification_templates_success/', '/notification_templates_error']; var columns = ['/notification_templates_started/', '/notification_templates_success/', '/notification_templates_error/'];
GetChoices({ GetChoices({
scope: scope, scope: scope,
@ -59,14 +59,14 @@ export default ['Wait', 'GetBasePath', 'ProcessErrors', 'Rest', 'GetChoices',
callback: 'choicesReadyNotifierList' callback: 'choicesReadyNotifierList'
}); });
_.map(columns, function(column){ _.map(columns, function(column){
var notifier_url = url + id + column; var notifier_url = url + id + column;
Rest.setUrl(notifier_url); Rest.setUrl(notifier_url);
Rest.get() Rest.get()
.then(function(response) { .then(function(response) {
let checkForSuccessOrError = response.config.url.indexOf('success')>0 ? "notification_templates_success" : "notification_templates_error"; let checkForSuccessOrError = response.config.url.indexOf('success') > 0 ? "notification_templates_success" : "notification_templates_error";
let type = response.config.url.indexOf('started')>0? "notification_templates_started" : checkForSuccessOrError let type = response.config.url.indexOf('started') > 0 ? "notification_templates_started" : checkForSuccessOrError;
if (response.data.results) { if (response.data.results) {
_.forEach(response.data.results, function(result){ _.forEach(response.data.results, function(result){

2
awx/ui/client/src/notifications/shared/toggle-notification.factory.js
View File

@ -45,7 +45,7 @@ export default ['Wait', 'ProcessErrors', 'Rest',
notifier[column] = !notifier[column]; notifier[column] = !notifier[column];
} }
// Hide the working spinner // Hide the working spinner
Wait('stop'); Wait('stop');
}) })
.catch(({data, status}) => { .catch(({data, status}) => {
ProcessErrors(scope, data, status, null, { hdr: 'Error!', ProcessErrors(scope, data, status, null, { hdr: 'Error!',