Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-23 15:21:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7062 from jwangyangls/userListPermission

Browse Source 
fix get users list about permission issue
This commit is contained in:
Mia ZHOU 2019-03-04 16:46:09 +08:00 committed by GitHub
commit 685e590514
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/src/app/project/member/add-member/add-member.component.ts
View File

@ -94,7 +94,7 @@ export class AddMemberComponent implements AfterViewChecked, OnInit, OnDestroy {
hasProjectAdminRole = (<Project>resolverData['projectResolver']).has_project_admin_role;
}
if (hasProjectAdminRole) {
this.userService.getUsers()
this.userService.getUsersNameList()
.then(users => {
this.userLists = users;
});

6
src/portal/src/app/user/user.service.ts
View File

@ -20,6 +20,7 @@ import { User, LDAPUser } from './user';
import LDAPUsertoUser from './user';
const userMgmtEndpoint = '/api/users';
const userListSearch = '/api/users/search';
const ldapUserEndpoint = '/api/ldap/users';
/**
@ -39,6 +40,11 @@ export class UserService {
}
// Get the user list
getUsersNameList(): Promise<User[]> {
return this.http.get(userListSearch, HTTP_GET_OPTIONS).toPromise()
.then(response => response.json() as User[])
.catch(error => this.handleError(error));
}
getUsers(): Promise<User[]> {
return this.http.get(userMgmtEndpoint, HTTP_GET_OPTIONS).toPromise()
.then(response => response.json() as User[])