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

Merge pull request #3775 from pengpengshui/ping_replicationRule

Browse Source 
Fix Replication Rule Ping target issue about #3770
This commit is contained in:
Wenkai Yin 2017-12-13 10:38:48 +08:00 committed by GitHub
commit 62c652ede0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts
View File

@ -262,10 +262,11 @@ export class CreateEditEndpointComponent implements AfterViewChecked, OnDestroy
delete payload[prop];
}
let changes: {[key: string]: any} = this.getChanges();
let changekeys: {[key: string]: any} = Object.keys(this.getChanges());
if (isEmptyObject(changes)) {
return;
}
let changekeys: {[key: string]: any} = Object.keys(changes);
changekeys.forEach((key: string) => {
payload[key] = changes[key];
});

2
src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts
View File

@ -74,7 +74,7 @@ export const CREATE_EDIT_RULE_TEMPLATE: string = `
</div>
<div class="form-group">
<label for="destination_insecure" class="col-md-4 form-group-label-override">{{'CONFIG.VERIFY_REMOTE_CERT' | translate }}</label>
<clr-checkbox #insecure class="col-md-8" name="insecure" id="destination_insecure" [clrDisabled]="testOngoing" [clrChecked]="!createEditRule.insecure" [clrDisabled]="readonly || !isCreateEndpoint" (clrCheckedChange)="setInsecureValue($event)">
<clr-checkbox #insecure class="col-md-8" name="insecure" id="destination_insecure" [clrChecked]="!createEditRule.insecure" [clrDisabled]="readonly || !isCreateEndpoint || testOngoing" (clrCheckedChange)="setInsecureValue($event)">
<a href="javascript:void(0)" role="tooltip" aria-haspopup="true" class="tooltip tooltip-top-right" style="top:-7px;">
<clr-icon shape="info-circle" class="info-tips-icon" size="24"></clr-icon>
<span class="tooltip-content">{{'CONFIG.TOOLTIP.VERIFY_REMOTE_CERT' | translate}}</span>

3
src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts
View File

@ -424,6 +424,9 @@ export class CreateEditRuleComponent implements AfterViewChecked {
pingTarget.password = this.createEditRule.password;
pingTarget.insecure = this.createEditRule.insecure;
} else {
for (let prop in pingTarget) {
delete pingTarget[prop];
}
pingTarget.id = this.createEditRule.endpointId;
}
toPromise<Endpoint>(this.endpointService

2
src/ui_ng/package.json
View File

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