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

wait until $rootScope.current_user is available, resolves #2126 (#2246)

Browse Source
This commit is contained in:
Leigh
2016-06-09 09:57:25 -04:00
parent 3e8aaa4b5e
commit f9a5955cc0
1 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/src/controllers/Credentials.js
View File

@@ -178,6 +178,8 @@ export function CredentialsAdd($scope, $rootScope, $compile, $location, $log,
$scope.canShareCredential = false; $scope.canShareCredential = false;
$rootScope.$watch('current_user', function(){
try {
if ($rootScope.current_user.is_superuser) { if ($rootScope.current_user.is_superuser) {
$scope.canShareCredential = true; $scope.canShareCredential = true;
} else { } else {
@@ -205,6 +207,11 @@ export function CredentialsAdd($scope, $rootScope, $compile, $location, $log,
input_type: 'radio', input_type: 'radio',
autopopulateLookup: false autopopulateLookup: false
}); });
}
catch(err){
// $rootScope.current_user isn't available because a call to the config endpoint hasn't finished resolving yet
}
});
if (!Empty($stateParams.user_id)) { if (!Empty($stateParams.user_id)) {
// Get the username based on incoming route // Get the username based on incoming route