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

get default template messages from OPTIONS

Browse Source
This commit is contained in:
Keith Grant 2019-07-01 14:38:51 -07:00 committed by Jim Ladd
parent a56a6d7158
commit 0398ce0530
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/notifications/add/add.controller.js
View File

@ -31,11 +31,7 @@ export default ['Rest', 'Wait', 'NotificationsFormObject',
$state.go("^");
Alert('Permission Error', 'You do not have permission to add a notification template.', 'alert-info');
}
// TODO: get default messages off data
console.log('OPTIONS:', data);
defaultMessages.start_message = 'It started';
defaultMessages.success_message = 'It succeeded';
defaultMessages.error_message = 'It failed';
defaultMessages = data.actions.POST.messages.default;
MessageUtils.setMessagesOnScope($scope, null, defaultMessages);
});
// apply form definition's default field values

13
awx/ui/client/src/notifications/edit/edit.controller.js
View File

@ -38,10 +38,15 @@ export default ['Rest', 'Wait',
}
});
// TODO: get OPTIONS for defaultMessages
defaultMessages.start_message = 'It started';
defaultMessages.success_message = 'It succeeded';
defaultMessages.error_message = 'It failed';
Rest.setUrl(GetBasePath('notification_templates'));
Rest.options()
.then(({data}) => {
if (!data.actions.POST) {
$state.go("^");
Alert('Permission Error', 'You do not have permission to add a notification template.', 'alert-info');
}
defaultMessages = data.actions.POST.messages.default;
});
GetChoices({
scope: $scope,

21
awx/ui/client/src/notifications/shared/message-utils.service.js
View File

@ -6,29 +6,32 @@ export default [function () {
}
return {
start: {
message: $scope.start_message === defaultMessages.start_message
message: $scope.start_message === defaultMessages.start.message
? null : $scope.start_message,
body: $scope.start_body === defaultMessages.start_body
body: $scope.start_body === defaultMessages.start.body
? null : $scope.start_body,
},
success: {
message: $scope.success_message === defaultMessages.success_message
message: $scope.success_message === defaultMessages.success.message
? null : $scope.success_message,
body: $scope.success_body === defaultMessages.success_body
body: $scope.success_body === defaultMessages.success.body
? null : $scope.success_body,
},
error: {
message: $scope.error_message === defaultMessages.error_message
message: $scope.error_message === defaultMessages.error.message
? null : $scope.error_message,
body: $scope.error_body === defaultMessages.error_body
body: $scope.error_body === defaultMessages.error.body
? null : $scope.error_body,
}
};
},
setMessagesOnScope: function ($scope, messages, defaultMessages) {
$scope.start_message = defaultMessages.start_message;
$scope.success_message = defaultMessages.success_message;
$scope.error_message = defaultMessages.error_message;
$scope.start_message = defaultMessages.start.message;
$scope.start_body = defaultMessages.start.body;
$scope.success_message = defaultMessages.success.message;
$scope.success_body = defaultMessages.success.body;
$scope.error_message = defaultMessages.error.message;
$scope.error_body = defaultMessages.error.body;
if (!messages) {
return;
}