vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2630 from charltonaustin/refresh_the_user_management_page_and_not_have_weird_errors_145041479

Browse source 
fix(entity-search.js): fix reload namespace
This commit is contained in:
Charlton Austin 2017-05-23 13:12:39 -04:00 • committed by GitHub
commit e52041fc87
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
static/js/directives/ui/entity-search.js
View file

@ -68,7 +68,10 @@ angular.module('quay').directive('entitySearch', function () {
}; };
$scope.lazyLoad = function() { $scope.lazyLoad = function() {
if (!$scope.namespace || !$scope.lazyLoading) { return; } if (!$scope.namespace || !$scope.thisUser || !$scope.lazyLoading) { return; }
$scope.isAdmin = UserService.isNamespaceAdmin($scope.namespace);
$scope.isOrganization = !!UserService.getOrganization($scope.namespace);
// Reset the cached teams and robots. // Reset the cached teams and robots.
$scope.teams = null; $scope.teams = null;
@ -359,8 +362,13 @@ angular.module('quay').directive('entitySearch', function () {
$scope.$watch('namespace', function(namespace) { $scope.$watch('namespace', function(namespace) {
if (!namespace) { return; } if (!namespace) { return; }
$scope.isAdmin = UserService.isNamespaceAdmin(namespace); $scope.lazyLoad();
$scope.isOrganization = !!UserService.getOrganization(namespace); });
UserService.updateUserIn($scope, function(currentUser){
if (currentUser.anonymous) { return; }
$scope.thisUser = currentUser;
$scope.lazyLoad();
}); });
$scope.$watch('currentEntity', function(entity) { $scope.$watch('currentEntity', function(entity) {

4
static/js/services/user-service.js
View file

@ -14,9 +14,9 @@ function(ApiService, CookieService, $rootScope, Config, $location) {
organizations: [], organizations: [],
logins: [], logins: [],
beforeload: true beforeload: true
} };
var userService = {} var userService = {};
var _EXTERNAL_SERVICES = ['ldap', 'jwtauthn', 'keystone', 'dex']; var _EXTERNAL_SERVICES = ['ldap', 'jwtauthn', 'keystone', 'dex'];
userService.hasEverLoggedIn = function() { userService.hasEverLoggedIn = function() {