fix(entity-search.js): fix reload namespace
before if you reloaded the say the team owners tab you would get an error this now watches the namespace and updates it [TESTING -> tested against prod like data with local docker build] Issue: https://www.pivotaltracker.com/story/show/145041479 - [ ] It works! - [ ] Comments provide sufficient explanations for the next contributor - [ ] Tests cover changes and corner cases - [ ] Follows Quay syntax patterns and format
This commit is contained in:
parent
f960fa2482
commit
9729ac3cbb
2 changed files with 13 additions and 5 deletions
|
@ -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) {
|
||||||
|
|
|
@ -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() {
|
||||||
|
|
Reference in a new issue