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

Show instance groups tab if user is an Org Admin

Browse Source
This commit is contained in:
Marliana Lara
2018-04-23 13:07:23 -04:00
parent e4ffdeb0b5
commit b9427ecf6d
2 changed files with 26 additions and 4 deletions
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'); const templateUrl = require('~components/layout/layout.partial.html');
function AtLayoutController ($scope, strings, $transitions) { function AtLayoutController ($scope, $http, strings, ProcessErrors, $transitions) {
const vm = this || {}; const vm = this || {};
$transitions.onSuccess({}, (transition) => { $transitions.onSuccess({}, (transition) => {
@@ -9,10 +9,14 @@ function AtLayoutController ($scope, strings, $transitions) {
$scope.$watch('$root.current_user', (val) => { $scope.$watch('$root.current_user', (val) => {
vm.isLoggedIn = val && val.username; vm.isLoggedIn = val && val.username;
if (val) { if (!_.isEmpty(val)) {
vm.isSuperUser = $scope.$root.user_is_superuser || $scope.$root.user_is_system_auditor; vm.isSuperUser = $scope.$root.user_is_superuser || $scope.$root.user_is_system_auditor;
vm.currentUsername = val.username; vm.currentUsername = val.username;
vm.currentUserId = val.id; vm.currentUserId = val.id;
if (!vm.isSuperUser) {
checkOrgAdmin();
}
} }
}); });
@@ -32,9 +36,27 @@ function AtLayoutController ($scope, strings, $transitions) {
return strings.get(string); 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 () { function atLayout () {
return { return {

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

@@ -85,7 +85,7 @@
system-admin-only="true"> system-admin-only="true">
</at-side-nav-item> </at-side-nav-item>
<at-side-nav-item icon-class="fa-server" route="instanceGroups" name="INSTANCE_GROUPS" <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>
<at-side-nav-item icon-class="fa-cubes" route="applications" name="APPLICATIONS" <at-side-nav-item icon-class="fa-cubes" route="applications" name="APPLICATIONS"
system-admin-only="true"> system-admin-only="true">