upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-21 05:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3598 from pengpengshui/master

Browse Source 
Modiy test connection without verify cert value
This commit is contained in:
pengpengshui 2017-11-14 14:37:01 +08:00 committed by GitHub
commit 91faac070f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -118,6 +118,7 @@ export class CreateEditEndpointComponent implements AfterViewChecked, OnDestroy
setInsecureValue($event: any) { setInsecureValue($event: any) {
this.target.insecure = !$event; this.target.insecure = !$event;
this.endpointHasChanged = true;
} }
ngOnDestroy(): void { ngOnDestroy(): void {
@ -210,6 +211,7 @@ export class CreateEditEndpointComponent implements AfterViewChecked, OnDestroy
payload.endpoint = this.target.endpoint; payload.endpoint = this.target.endpoint;
payload.username = this.target.username; payload.username = this.target.username;
payload.password = this.target.password; payload.password = this.target.password;
payload.insecure = this.target.insecure;
} else { } else {
payload.id = this.target.id; payload.id = this.target.id;
} }

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

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

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

@ -422,6 +422,7 @@ export class CreateEditRuleComponent implements AfterViewChecked {
pingTarget.endpoint = this.createEditRule.endpointUrl || ''; pingTarget.endpoint = this.createEditRule.endpointUrl || '';
pingTarget.username = this.createEditRule.username; pingTarget.username = this.createEditRule.username;
pingTarget.password = this.createEditRule.password; pingTarget.password = this.createEditRule.password;
pingTarget.insecure = this.createEditRule.insecure;
} else { } else {
pingTarget.id = this.createEditRule.endpointId; pingTarget.id = this.createEditRule.endpointId;
} }

2
src/ui_ng/package.json
View File

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