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

Merge pull request #5527 from zhoumeina/pr/fix_cert_verify_show_in_not_ldap

Browse Source 
Fix ldap cert verify has to align with ldap mode. should not show in …
This commit is contained in:
Mia ZHOU 2018-08-06 11:03:51 +08:00 committed by GitHub
commit d1304585d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui_ng/src/app/config/auth/config-auth.component.html
View File

@ -202,7 +202,7 @@
</clr-checkbox> </clr-checkbox>
</div> </div>
</section> </section>
<section> <section *ngIf="showLdap">
<div class="form-group"> <div class="form-group">
<label for="ldapVerifyCert">{{'CONFIG.LDAP.VERIFY_CERT' | translate}}</label> <label for="ldapVerifyCert">{{'CONFIG.LDAP.VERIFY_CERT' | translate}}</label>
<clr-checkbox name="ldapVerifyCert" id="ldapVerifyCert" [clrChecked]="currentConfig.ldap_verify_cert.value" [clrDisabled]="disabled(currentConfig.ldap_scope)" <clr-checkbox name="ldapVerifyCert" id="ldapVerifyCert" [clrChecked]="currentConfig.ldap_verify_cert.value" [clrDisabled]="disabled(currentConfig.ldap_scope)"

2
src/ui_ng/src/app/group/add-group-modal/add-group-modal.component.ts
View File

@ -95,7 +95,7 @@ export class AddGroupModalComponent implements OnInit, OnDestroy {
.finally(() => this.close()) .finally(() => this.close())
.subscribe( .subscribe(
res => { res => {
this.msgHandler.showSuccess("ADD_GROUP_FAILURE"); this.msgHandler.showSuccess("GROUP.EDIT_GROUP_SUCCESS");
this.dataChange.emit(); this.dataChange.emit();
}, },
error => this.msgHandler.handleError(error) error => this.msgHandler.handleError(error)

2
src/ui_ng/src/i18n/lang/en-us-lang.json
View File

@ -264,7 +264,7 @@
"PROPERTY": "Property", "PROPERTY": "Property",
"REG_TIME": "Registration Time", "REG_TIME": "Registration Time",
"ADD_GROUP_SUCCESS": "Add group success", "ADD_GROUP_SUCCESS": "Add group success",
"ADD_GROUP_FAILURE": "Add group failure", "EDIT_GROUP_SUCCESS": "Edit group success",
"LDAP_TYPE": "LDAP" "LDAP_TYPE": "LDAP"
}, },
"AUDIT_LOG": { "AUDIT_LOG": {

2
src/ui_ng/src/i18n/lang/es-es-lang.json
View File

@ -263,7 +263,7 @@
"PROPERTY": "Property", "PROPERTY": "Property",
"REG_TIME": "Registration Time", "REG_TIME": "Registration Time",
"ADD_GROUP_SUCCESS": "Add group success", "ADD_GROUP_SUCCESS": "Add group success",
"ADD_GROUP_FAILURE": "Add group failure", "EDIT_GROUP_SUCCESS": "Edit group success",
"LDAP_TYPE": "LDAP" "LDAP_TYPE": "LDAP"
}, },
"AUDIT_LOG": { "AUDIT_LOG": {

2
src/ui_ng/src/i18n/lang/fr-fr-lang.json
View File

@ -247,7 +247,7 @@
"PROPERTY": "Property", "PROPERTY": "Property",
"REG_TIME": "Registration Time", "REG_TIME": "Registration Time",
"ADD_GROUP_SUCCESS": "Add group success", "ADD_GROUP_SUCCESS": "Add group success",
"ADD_GROUP_FAILURE": "Add group failure", "EDIT_GROUP_SUCCESS": "Edit group success",
"LDAP_TYPE": "LDAP" "LDAP_TYPE": "LDAP"
}, },
"AUDIT_LOG": { "AUDIT_LOG": {

2
src/ui_ng/src/i18n/lang/zh-cn-lang.json
View File

@ -263,7 +263,7 @@
"GROUP_DN": "LDAP 组域", "GROUP_DN": "LDAP 组域",
"REG_TIME": "注册时间", "REG_TIME": "注册时间",
"ADD_GROUP_SUCCESS": "添加组成功", "ADD_GROUP_SUCCESS": "添加组成功",
"ADD_GROUP_FAILURE": "添加组失败", "EDIT_GROUP_SUCCESS": "修改组成功",
"LDAP_TYPE": "LDAP" "LDAP_TYPE": "LDAP"
}, },
"AUDIT_LOG": { "AUDIT_LOG": {