Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-10-04 00:07:47 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6930 from jwangyangls/issue-6923

Browse Source 
fix issue 2923
This commit is contained in:
jwangyangls 2019-02-15 15:53:51 +08:00 committed by GitHub
commit d28b8355ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/src/app/project/list-project/list-project.component.html
View File

@ -2,7 +2,7 @@
<clr-dg-action-bar>
<button type="button" class="btn btn-sm btn-secondary" (click)="addNewProject()" *ngIf="projectCreationRestriction">
<clr-icon shape="plus" size="16"></clr-icon>&nbsp;{{'PROJECT.NEW_PROJECT' | translate}}</button>
<button type="button" class="btn btn-sm btn-secondary" [disabled]="!(selectedRow.length && (isSystemAdmin || canDelete))"
<button type="button" class="btn btn-sm btn-secondary" [disabled]="!canDelete"
(click)="deleteProjects(selectedRow)">
<clr-icon shape="times" size="16"></clr-icon>&nbsp;{{'PROJECT.DELETE' | translate}}</button>
</clr-dg-action-bar>

7
src/portal/src/app/project/list-project/list-project.component.ts
View File

@ -113,10 +113,11 @@ export class ListProjectComponent implements OnDestroy {
}
public get canDelete(): boolean {
if (this.projects.length) {
return this.projects.some((pro: Project) => pro.current_user_role_id === 1);
if (!this.selectedRow.length) {
return false;
}
return false;
return this.isSystemAdmin || this.selectedRow.every((pro: Project) => pro.current_user_role_id === 1);
}
ngOnDestroy(): void {