Merge pull request #3514 from ninjadq/fix_project_level_policy_issue

* fix bug when save policies
* improve text of vulnerability
* fix bug project admin can see the config tab
This commit is contained in:
Deng, Qian 2017-11-01 04:53:29 -05:00 committed by GitHub
commit c19a7a56da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 4 deletions

View File

@ -107,7 +107,7 @@ export class ProjectPolicyConfigComponent implements OnInit {
}
hasChanges() {
return compareValue(this.orgProjectPolicy, this.projectPolicy)
return !compareValue(this.orgProjectPolicy, this.projectPolicy);
}
save() {

View File

@ -18,7 +18,7 @@ export const TAG_TEMPLATE = `
<clr-dg-column style="min-width: 160px;" [clrDgField]="'name'">{{'REPOSITORY.TAG' | translate}}</clr-dg-column>
<clr-dg-column style="width: 90px;" [clrDgField]="'size'">{{'REPOSITORY.SIZE' | translate}}</clr-dg-column>
<clr-dg-column style="min-width: 120px; max-width:220px;">{{'REPOSITORY.PULL_COMMAND' | translate}}</clr-dg-column>
<clr-dg-column style="width: 140px;" *ngIf="withClair">{{'VULNERABILITY.SINGULAR' | translate}}</clr-dg-column>
<clr-dg-column style="width: 140px;" *ngIf="withClair">{{'REPOSITORY.VULNERABILITY' | translate}}</clr-dg-column>
<clr-dg-column style="width: 80px;" *ngIf="withNotary">{{'REPOSITORY.SIGNED' | translate}}</clr-dg-column>
<clr-dg-column style="width: 130px;">{{'REPOSITORY.AUTHOR' | translate}}</clr-dg-column>
<clr-dg-column style="width: 160px;"[clrDgSortBy]="createdComparator">{{'REPOSITORY.CREATED' | translate}}</clr-dg-column>

View File

@ -31,7 +31,7 @@
"clarity-icons": "^0.9.8",
"clarity-ui": "^0.9.8",
"core-js": "^2.4.1",
"harbor-ui": "0.4.92",
"harbor-ui": "0.4.96",
"intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0",

View File

@ -16,7 +16,7 @@
<li class="nav-item" *ngIf="isSessionValid && isSystemAdmin">
<a class="nav-link" routerLink="replications" routerLinkActive="active">{{'PROJECT_DETAIL.REPLICATION' | translate}}</a>
</li>
<li class="nav-item" *ngIf="isSessionValid && isSystemAdmin">
<li class="nav-item" *ngIf="isSessionValid && (isSystemAdmin || isMember)">
<a class="nav-link" routerLink="configs" routerLinkActive="active">{{'PROJECT_DETAIL.CONFIG' | translate}}</a>
</li>
</ul>

View File

@ -348,6 +348,7 @@
"FILTER_FOR_REPOSITORIES": "Filter Repositories",
"TAG": "Tag",
"SIZE": "Size",
"VULNERABILITY": "Vulnerability",
"SIGNED": "Signed",
"AUTHOR": "Author",
"CREATED": "Creation Time",

View File

@ -349,6 +349,7 @@
"FILTER_FOR_REPOSITORIES": "Filtrar Repositorios",
"TAG": "Etiqueta",
"SIZE": "Size",
"VULNERABILITY": "Vulnerability",
"SIGNED": "Firmada",
"AUTHOR": "Autor",
"CREATED": "Fecha de creación",

View File

@ -348,6 +348,7 @@
"FILTER_FOR_REPOSITORIES": "过滤镜像仓库",
"TAG": "标签",
"SIZE": "大小",
"VULNERABILITY": "漏洞",
"SIGNED": "已签名",
"AUTHOR": "作者",
"CREATED": "创建时间",