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

Merge pull request #1961 from wknet123/master-new

Browse Source 
Make role name consistent.
This commit is contained in:
Daniel Jiang 2017-04-07 19:18:58 +08:00 committed by GitHub
commit 642dbe329e
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui_ng/src/app/project/project-detail/project-detail.component.html
View File

@ -1,7 +1,7 @@
<a *ngIf="hasSignedIn" [routerLink]="['/harbor', 'projects']">&lt; {{'PROJECT_DETAIL.PROJECTS' | translate}}</a>
<a *ngIf="!hasSignedIn" [routerLink]="['/harbor', 'sign-in']">&lt; {{'SEARCH.BACK' | translate}}</a>
<h1 class="sub-header-title">{{currentProject.name}} <span class="role-label" *ngIf="isMember">{{roleName | translate}}</span> <span class="role-label" *ngIf="isSystemAdmin">{{ 'MEMBER.SYS_ADMIN' | translate}}</span></h1>
<h1 class="sub-header-title">{{currentProject.name}} <span class="role-label" *ngIf="isMember">{{roleName | translate}}</span></h1>
<nav class="subnav sub-nav-bg-color">
<ul class="nav">
<li class="nav-item">

6
src/ui_ng/src/app/project/project-routing-resolver.service.ts
View File

@ -24,10 +24,6 @@ export class ProjectRoutingResolver implements Resolve<Project>{
if(project) {
let currentUser = this.sessionService.getCurrentUser();
if(currentUser) {
if(currentUser.has_admin_role === 1) {
project.has_project_admin_role = true;
project.role_name = 'sysAdmin';
} else {
let projectMembers = this.sessionService.getProjectMembers();
if(projectMembers) {
let currentMember = projectMembers.find(m=>m.user_id === currentUser.user_id);
@ -37,6 +33,8 @@ export class ProjectRoutingResolver implements Resolve<Project>{
project.role_name = currentMember.role_name;
}
}
if(currentUser.has_admin_role === 1) {
project.has_project_admin_role = true;
}
}
return project;