upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 18:45:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4673 from ninjadq/fix_bug_4665

Browse Source 
Fix bug 4665 project admin can not change the role of some user
This commit is contained in:
Qian Deng 2018-04-17 10:47:03 +08:00 committed by GitHub
commit 0f271710ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ui_ng/src/app/project/member/member.component.ts
View File

@ -135,7 +135,7 @@ export class MemberComponent implements OnInit, OnDestroy {
}
get onlySelf(): boolean {
if (this.selectedRow.length === 1 && this.selectedRow[0].id === this.currentUser.user_id) {
if (this.selectedRow.length === 1 && this.selectedRow[0].entity_id === this.currentUser.user_id) {
return true;
}
return false;
@ -163,7 +163,7 @@ export class MemberComponent implements OnInit, OnDestroy {
if (members && members.length) {
let promiseList: any[] = [];
members.forEach(member => {
if (member.id === this.currentUser.user_id) {
if (member.entity_id === this.currentUser.user_id) {
let foundMember = this.batchActionInfos.find(batchInfo => batchInfo.name === member.entity_name);
this.translate.get("BATCH.SWITCH_FAILURE").subscribe(res => {
this.messageHandlerService.handleError(res + ": " + foundMember.name);
@ -239,7 +239,7 @@ export class MemberComponent implements OnInit, OnDestroy {
if (members && members.length) {
let promiseLists: any[] = [];
members.forEach(member => {
if (member.id === this.currentUser.user_id) {
if (member.entity_id === this.currentUser.user_id) {
let findedList = this.batchDeletionInfos.find(data => data.name === member.entity_name);
this.translate.get("BATCH.DELETED_FAILURE").subscribe(res => {
findedList = BathInfoChanges(findedList, res, false, true);