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

Only allow user with super_user access to see activity stream button. Fixed collision between is_superuser rootscope variable and credential.is_superuser on credential detail page. Added AS to user/n/permissions page.

Browse Source
This commit is contained in:
Chris Houseknecht
2013-11-19 20:39:28 +00:00
parent e2e8a7e346
commit 94bbab566b
26 changed files with 79 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/static/lib/ansible/AuthService.js
View File

@@ -104,7 +104,7 @@ angular.module('AuthService', ['ngCookies', 'Utilities'])
setUserInfo: function(response) {
// store the response values in $rootScope so we can get to them later
$rootScope.current_user = response.results[0];
$cookieStore.put('current_user', response.results[0]); //keep in session cookie incase user hits refresh
$cookieStore.put('current_user', response.results[0]); //keep in session cookie in the event of browser refresh
},
restoreUserInfo: function() {
@@ -113,7 +113,14 @@ angular.module('AuthService', ['ngCookies', 'Utilities'])
getUserInfo: function(key) {
// Access values returned from the Me API call
return ($rootScope.current_user[key]) ? $rootScope.current_user[key] : null;
if ($rootScope.current_user ) {
return $rootScope.current_user[key]
}
else {
this.restoreUserInfo();
var cu = $cookieStore.get('current_user');
return cu[key];
}
}
}
}]);