External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-16 12:20:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4340 from jakemcdermott/fix-4336

Browse Source 
[3.7.1] Enable management job notications for admins
This commit is contained in:
Jake McDermott 2020-06-09 16:27:07 -04:00 committed by GitHub
commit ee6f03515e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/management-jobs/notifications/notification.controller.js
View File

@ -6,10 +6,10 @@
export default
[ 'NotificationsList', 'GetBasePath', 'ToggleNotification', 'NotificationsListInit',
'$stateParams', 'Dataset', '$scope',
'$stateParams', 'Dataset', '$scope', 'isAdmin',
function(
NotificationsList, GetBasePath, ToggleNotification, NotificationsListInit,
$stateParams, Dataset, $scope) {
$stateParams, Dataset, $scope, isAdmin) {
var defaultUrl = GetBasePath('system_job_templates'),
list = NotificationsList,
id = $stateParams.management_id;
@ -19,6 +19,8 @@ export default
$scope[`${list.iterator}_dataset`] = Dataset.data;
$scope[list.name] = $scope[`${list.iterator}_dataset`].results;
$scope.sufficientRoleForNotifToggle = isAdmin;
NotificationsListInit({
scope: $scope,
url: defaultUrl,

13
awx/ui/client/src/management-jobs/notifications/notification.route.js
View File

@ -39,6 +39,19 @@ export default {
let path = `${GetBasePath('system_job_templates')}${$stateParams.management_id}`;
Rest.setUrl(path);
return Rest.get(path).then((res) => res.data);
}],
isAdmin: ['Rest', 'GetBasePath', function(Rest, GetBasePath) {
Rest.setUrl(GetBasePath('me'));
return Rest.get()
.then((res) => {
if (res.data && res.data.results && res.data.count && res.data.results[0] && res.data.results[0].is_superuser) {
return true;
}
return false;
})
.catch(() => {
return false;
});
}]
},
ncyBreadcrumb: {