External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4399 from mabashian/3676-notif-menu

Browse Source 
Show notification menu to users with notification_admin team role

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-07-30 22:46:07 +00:00
committed by GitHub
parent 416b2ef37a a6c50f6d20
commit 4a35df9a1c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/lib/components/layout/layout.directive.js
View File

@@ -61,8 +61,8 @@ function AtLayoutController ($scope, $http, strings, ProcessErrors, $transitions
} }
function checkNotificationAdmin () { function checkNotificationAdmin () {
const usersPath = `/api/v2/users/${vm.currentUserId}/roles/?role_field=notification_admin_role`; const notifAdminOrgsPath = 'api/v2/organizations/?role_level=notification_admin_role';
$http.get(usersPath) $http.get(notifAdminOrgsPath)
.then(({ data }) => { .then(({ data }) => {
if (data.count > 0) { if (data.count > 0) {
vm.isNotificationAdmin = true; vm.isNotificationAdmin = true;
@@ -73,7 +73,7 @@ function AtLayoutController ($scope, $http, strings, ProcessErrors, $transitions
.catch(({ data, status }) => { .catch(({ data, status }) => {
ProcessErrors(null, data, status, null, { ProcessErrors(null, data, status, null, {
hdr: strings.get('error.HEADER'), hdr: strings.get('error.HEADER'),
msg: strings.get('error.CALL', { path: usersPath, action: 'GET', status }) msg: strings.get('error.CALL', { path: notifAdminOrgsPath, action: 'GET', status })
}); });
}); });
} }

2
awx/ui/test/unit/components/layout.unit.js
View File

@@ -46,7 +46,7 @@ describe('Components | Layout', () => {
$httpBackend.when('GET', /admin_of_organizations/) $httpBackend.when('GET', /admin_of_organizations/)
.respond(mockOrgAdminResponse); .respond(mockOrgAdminResponse);
$httpBackend.when('GET', /roles\/\?role_field=notification_admin_role/) $httpBackend.when('GET', /organizations\/\?role_level=notification_admin_role/)
.respond(mockNotificationAdminResponse); .respond(mockNotificationAdminResponse);
}); });