External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 11:57:37 -02: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
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("^"); $state.go("^");
Alert('Permission Error', 'You do not have permission to add a notification template.', 'alert-info'); Alert('Permission Error', 'You do not have permission to add a notification template.', 'alert-info');
} }
// TODO: get default messages off data defaultMessages = data.actions.POST.messages.default;
console.log('OPTIONS:', data);
defaultMessages.start_message = 'It started';
defaultMessages.success_message = 'It succeeded';
defaultMessages.error_message = 'It failed';
MessageUtils.setMessagesOnScope($scope, null, defaultMessages); MessageUtils.setMessagesOnScope($scope, null, defaultMessages);
}); });
// apply form definition's default field values // 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 Rest.setUrl(GetBasePath('notification_templates'));
defaultMessages.start_message = 'It started'; Rest.options()
defaultMessages.success_message = 'It succeeded'; .then(({data}) => {
defaultMessages.error_message = 'It failed'; 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({ GetChoices({
scope: $scope, scope: $scope,

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

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