Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-29 13:57:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2947 from pengpengshui/master

Browse Source 
fix 2912 #2938 about save button in  vul tag and signed icon
This commit is contained in:
Steven Zou 2017-08-03 09:54:25 +08:00 committed by GitHub
commit c21bbbe1e9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui_ng/lib/src/tag/tag.component.html.ts
View File

@ -40,8 +40,8 @@ export const TAG_TEMPLATE = `
<hbr-vulnerability-bar [repoName]="repoName" [tagId]="t.name" [summary]="t.scan_overview"></hbr-vulnerability-bar>
</clr-dg-cell>
<clr-dg-cell style="width: 80px;" *ngIf="withNotary" [ngSwitch]="t.signature !== null">
<clr-icon shape="check" *ngSwitchCase="true" style="color: #1D5100;"></clr-icon>
<clr-icon shape="close" *ngSwitchCase="false" style="color: #C92100;"></clr-icon>
<clr-icon shape="check-circle" *ngSwitchCase="true" size="20" style="color: #1D5100;"></clr-icon>
<clr-icon shape="times-circle" *ngSwitchCase="false" size="16" style="color: #C92100;"></clr-icon>
<a href="javascript:void(0)" *ngSwitchDefault role="tooltip" aria-haspopup="true" class="tooltip tooltip-top-right">
<clr-icon shape="help" style="color: #565656;" size="16"></clr-icon>
<span class="tooltip-content">{{'REPOSITORY.NOTARY_IS_UNDETERMINED' | translate}}</span>

4
src/ui_ng/src/app/config/config.component.ts
View File

@ -434,7 +434,6 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
if (!this.allConfig || !this.originalCopy) {
return changes;
}
for (let prop in this.allConfig) {
let field = this.originalCopy[prop];
if (field && field.editable) {
@ -500,7 +499,8 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
if (!this.isEmpty(changes)) {
for (let prop in changes) {
if (this.originalCopy[prop]) {
this.allConfig[prop] = Object.assign({}, this.originalCopy[prop]);
this.allConfig[prop] = this.clone(this.originalCopy[prop]);
//this.allConfig[prop] = Object.assign({}, this.originalCopy[prop]);
}
}
} else {