From 3c95bbd53a6d5509e56d7fffb8b4c51642621733 Mon Sep 17 00:00:00 2001
From: kunw <kunw@vmware.com>
Date: Fri, 7 Apr 2017 17:55:57 +0800
Subject: [PATCH] Make role name consistent.

---
 .../project-detail.component.html             |  2 +-
 .../project-routing-resolver.service.ts       | 20 +++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/ui_ng/src/app/project/project-detail/project-detail.component.html b/src/ui_ng/src/app/project/project-detail/project-detail.component.html
index f14d118f7..ff651917b 100644
--- a/src/ui_ng/src/app/project/project-detail/project-detail.component.html
+++ b/src/ui_ng/src/app/project/project-detail/project-detail.component.html
@@ -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">
diff --git a/src/ui_ng/src/app/project/project-routing-resolver.service.ts b/src/ui_ng/src/app/project/project-routing-resolver.service.ts
index aaa2ce6c0..39bae67ee 100644
--- a/src/ui_ng/src/app/project/project-routing-resolver.service.ts
+++ b/src/ui_ng/src/app/project/project-routing-resolver.service.ts
@@ -24,19 +24,17 @@ export class ProjectRoutingResolver implements Resolve<Project>{
                   if(project) {
                     let currentUser = this.sessionService.getCurrentUser();
                     if(currentUser) {
+                      let projectMembers = this.sessionService.getProjectMembers();
+                      if(projectMembers) {
+                        let currentMember = projectMembers.find(m=>m.user_id === currentUser.user_id);
+                        if(currentMember) {
+                          project.is_member = true;
+                          project.has_project_admin_role = (currentMember.role_name === 'projectAdmin');
+                          project.role_name = currentMember.role_name;
+                        } 
+                      }
                       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);
-                          if(currentMember) {
-                            project.is_member = true;
-                            project.has_project_admin_role = (currentMember.role_name === 'projectAdmin');
-                            project.role_name = currentMember.role_name;
-                          } 
-                        }
                       }
                     }
                     return project;