shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

Merge pull request #1509 from marshmalien/fix/1380-org-admin-ig-access

Browse Source 
Show instance groups tab if user is an Org Admin
This commit is contained in:
Marliana Lara 2018-04-24 14:30:37 -04:00 committed by GitHub
commit 2d9c4cff32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
const templateUrl = require('~components/layout/layout.partial.html');
function AtLayoutController ($scope, strings, $transitions) {
function AtLayoutController ($scope, $http, strings, ProcessErrors, $transitions) {
const vm = this || {};
$transitions.onSuccess({}, (transition) => {
@ -9,10 +9,14 @@ function AtLayoutController ($scope, strings, $transitions) {
$scope.$watch('$root.current_user', (val) => {
vm.isLoggedIn = val && val.username;
if (val) {
if (!_.isEmpty(val)) {
vm.isSuperUser = $scope.$root.user_is_superuser || $scope.$root.user_is_system_auditor;
vm.currentUsername = val.username;
vm.currentUserId = val.id;
if (!vm.isSuperUser) {
checkOrgAdmin();
}
}
});
@ -32,9 +36,27 @@ function AtLayoutController ($scope, strings, $transitions) {
return strings.get(string);
}
};
function checkOrgAdmin () {
const usersPath = `/api/v2/users/${vm.currentUserId}/admin_of_organizations/`;
$http.get(usersPath)
.then(({ data }) => {
if (data.count > 0) {
vm.isOrgAdmin = true;
} else {
vm.isOrgAdmin = false;
}
})
.catch(({ data, status }) => {
ProcessErrors(null, data, status, null, {
hdr: strings.get('error.HEADER'),
msg: strings.get('error.CALL', { path: usersPath, action: 'GET', status })
});
});
}
}
AtLayoutController.$inject = ['$scope', 'ComponentsStrings', '$transitions'];
AtLayoutController.$inject = ['$scope', '$http', 'ComponentsStrings', 'ProcessErrors', '$transitions'];
function atLayout () {
return {

2
awx/ui/client/lib/components/layout/layout.partial.html
View File

@ -85,7 +85,7 @@
system-admin-only="true">
</at-side-nav-item>
<at-side-nav-item icon-class="fa-server" route="instanceGroups" name="INSTANCE_GROUPS"
system-admin-only="true">
ng-show="$parent.layoutVm.isSuperUser || $parent.layoutVm.isOrgAdmin">
</at-side-nav-item>
<at-side-nav-item icon-class="fa-cubes" route="applications" name="APPLICATIONS"
system-admin-only="true">

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

@ -1,6 +1,7 @@
describe('Components | Layout', () => {
let $compile;
let $rootScope;
let $httpBackend;
let element;
let scope;
@ -10,11 +11,14 @@ describe('Components | Layout', () => {
angular.mock.module('ui.router');
angular.mock.module('at.lib.services');
angular.mock.module('at.lib.components');
angular.mock.module('Utilities');
angular.mock.module('ngCookies');
});
beforeEach(angular.mock.inject((_$compile_, _$rootScope_) => {
beforeEach(angular.mock.inject((_$compile_, _$rootScope_, _$httpBackend_) => {
$compile = _$compile_;
$rootScope = _$rootScope_;
$httpBackend = _$httpBackend_;
scope = $rootScope.$new();
element = angular.element('<at-layout></at-layout>');
@ -26,7 +30,15 @@ describe('Components | Layout', () => {
let controller;
beforeEach(() => {
const mockResponse = {
data: {
count: 3
}
};
controller = element.controller('atLayout');
$httpBackend.when('GET', /admin_of_organizations/)
.respond(mockResponse);
});
xit('$scope.$on($stateChangeSuccess) should assign toState name to currentState', () => {

2
awx/ui/test/unit/components/side-nav-item.unit.js
View File

@ -10,6 +10,8 @@ describe('Components | Side Nav Item', () => {
angular.mock.module('ui.router');
angular.mock.module('at.lib.services');
angular.mock.module('at.lib.components');
angular.mock.module('Utilities');
angular.mock.module('ngCookies');
});
beforeEach(angular.mock.inject((_$compile_, _$rootScope_) => {

2
awx/ui/test/unit/components/side-nav.unit.js
View File

@ -15,6 +15,8 @@ describe('Components | Side Nav', () => {
angular.mock.module('at.lib.components', ($provide) => {
$provide.value('$window', windowMock);
});
angular.mock.module('Utilities');
angular.mock.module('ngCookies');
});
beforeEach(angular.mock.inject((_$compile_, _$rootScope_) => {