Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-22 10:15:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5441 from zhoumeina/pr/ui_support_input_admin_dn

Browse Source 
Add ldap admin DN
This commit is contained in:
Mia ZHOU 2018-08-01 12:43:13 +08:00 committed by GitHub
commit 7a24dcdb05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,12 +137,9 @@
</clr-checkbox>
</div>
<div class="form-group">
<label for="ldapGroupBaseDN" class="required">{{'CONFIG.LDAP.LDAP_GROUP_BASE_DN' | translate}}</label>
<label for="ldapGroupBaseDN" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-lg tooltip-top-right">
<input name="ldapGroupBaseDN" type="text" #ldapGroupDNInput="ngModel" [(ngModel)]="currentConfig.ldap_group_base_dn.value"
<label for="ldapGroupBaseDN">{{'CONFIG.LDAP.LDAP_GROUP_BASE_DN' | translate}}</label>
<input name="ldapGroupBaseDN" class="padding-right-28" type="text" #ldapGroupDNInput="ngModel" [(ngModel)]="currentConfig.ldap_group_base_dn.value"
id="ldapGroupBaseDN" size="40" [disabled]="disabled(currentConfig.ldap_group_base_dn)">
<span class="tooltip-content"> {{'TOOLTIP.ITEM_REQUIRED' | translate}} </span>
</label>
<clr-tooltip>
<clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>
<clr-tooltip-content clrPosition="top-right" clrSize="lg" *clrIfOpen>
@ -151,12 +148,9 @@
</clr-tooltip>
</div>
<div class="form-group">
<label for="ldapGroupFilter" class="required">{{'CONFIG.LDAP.LDAP_GROUP_FILTER' | translate}}</label>
<label for="ldapGroupFilter" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-lg tooltip-top-right">
<input name="ldapGroupFilter" type="text" #ldapGroupFilterInput="ngModel" [(ngModel)]="currentConfig.ldap_group_search_filter.value"
<label for="ldapGroupFilter">{{'CONFIG.LDAP.LDAP_GROUP_FILTER' | translate}}</label>
<input name="ldapGroupFilter" type="text" class="padding-right-28" #ldapGroupFilterInput="ngModel" [(ngModel)]="currentConfig.ldap_group_search_filter.value"
id="ldapGroupFilter" size="40" [disabled]="disabled(currentConfig.ldap_group_search_filter)">
<span class="tooltip-content"> {{'TOOLTIP.ITEM_REQUIRED' | translate}} </span>
</label>
<clr-tooltip>
<clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>
<clr-tooltip-content clrPosition="top-right" clrSize="lg" *clrIfOpen>
@ -165,12 +159,9 @@
</clr-tooltip>
</div>
<div class="form-group">
<label for="ldapGroupGID" class="required">{{'CONFIG.LDAP.LDAP_GROUP_GID' | translate}}</label>
<label for="ldapGroupGID" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-lg tooltip-top-right">
<input name="ldapGroupGID" type="text" #ldapGroupDNInput="ngModel" [(ngModel)]="currentConfig.ldap_group_attribute_name.value"
<label for="ldapGroupGID">{{'CONFIG.LDAP.LDAP_GROUP_GID' | translate}}</label>
<input name="ldapGroupGID" class="padding-right-28" type="text" #ldapGroupDNInput="ngModel" [(ngModel)]="currentConfig.ldap_group_attribute_name.value"
id="ldapGroupGID" size="40" [disabled]="disabled(currentConfig.ldap_group_attribute_name)">
<span class="tooltip-content"> {{'TOOLTIP.ITEM_REQUIRED' | translate}} </span>
</label>
<clr-tooltip>
<clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>
<clr-tooltip-content clrPosition="top-right" clrSize="lg" *clrIfOpen>
@ -178,6 +169,19 @@
</clr-tooltip-content>
</clr-tooltip>
</div>
<!-- This is for ldap group admin dn -->
<div class="form-group">
<label>{{'CONFIG.LDAP.LDAP_GROUP_ADMIN_DN' | translate}}</label>
<input name="ldapGroupAdminDN" class="padding-right-28" type="text" #ldapGroupFilterInput="ngModel" [(ngModel)]="currentConfig.ldap_group_admin_dn.value"
id="ldapGroupAdminDN" size="40" [disabled]="disabled(currentConfig.ldap_group_admin_dn)">
<clr-tooltip>
<clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>
<clr-tooltip-content clrPosition="top-right" clrSize="lg" *clrIfOpen>
<span>{{'CONFIG.LDAP.LDAP_GROUP_ADMIN_DN_INFO' | translate}}</span>
</clr-tooltip-content>
</clr-tooltip>
</div>
<!-- End of ldap group admin dn -->
<div class="form-group">
<label for="ldapGroupScope">{{'CONFIG.LDAP.GROUP_SCOPE' | translate}}</label>
<div class="select">
@ -194,6 +198,7 @@
</clr-tooltip-content>
</clr-tooltip>
</div>
</section>
<section class="form-block">
<div class="form-group">

4
src/ui_ng/src/app/config/auth/config-auth.component.scss
View File

@ -1,3 +1,7 @@
clr-tooltip {
top: -1px;
}
.padding-right-28 {
padding-right:28px;
}

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

@ -553,6 +553,8 @@
"LDAP_GROUP_FILTER_INFO": "The filter of your LDAP group",
"LDAP_GROUP_GID": "LDAP Group GID",
"LDAP_GROUP_GID_INFO": "The Group gid of your LDAP group",
"LDAP_GROUP_ADMIN_DN": "LDAP Group Admin DN",
"LDAP_GROUP_ADMIN_DN_INFO": "The Admin DN of your LDAP group",
"GROUP_SCOPE": "LDAP Group Scope",
"GROUP_SCOPE_INFO": "The scope of your LDAP Group"

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

@ -553,6 +553,8 @@
"LDAP_GROUP_FILTER_INFO": "The filter of your LDAP group",
"LDAP_GROUP_GID": "LDAP Group GID",
"LDAP_GROUP_GID_INFO": "The Group gid of your LDAP group",
"LDAP_GROUP_ADMIN_DN": "LDAP Group Admin DN",
"LDAP_GROUP_ADMIN_DN_INFO": "The Admin DN of your LDAP group",
"GROUP_SCOPE": "LDAP Group Scope",
"GROUP_SCOPE_INFO": "The scope of your LDAP Group"
},

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

@ -524,6 +524,8 @@
"LDAP_GROUP_FILTER_INFO": "The filter of your LDAP group",
"LDAP_GROUP_GID": "LDAP Group GID",
"LDAP_GROUP_GID_INFO": "The Group gid of your LDAP group",
"LDAP_GROUP_ADMIN_DN": "LDAP Group Admin DN",
"LDAP_GROUP_ADMIN_DN_INFO": "The Admin DN of your LDAP group",
"GROUP_SCOPE": "LDAP Group Scope",
"GROUP_SCOPE_INFO": "The scope of your LDAP Group"
},

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

@ -553,6 +553,8 @@
"LDAP_GROUP_FILTER_INFO": "LDAP组的过滤器",
"LDAP_GROUP_GID": "LDAP组GID",
"LDAP_GROUP_GID_INFO": "LDAP组的GID",
"LDAP_GROUP_ADMIN_DN": "LDAP组管理员DN",
"LDAP_GROUP_ADMIN_DN_INFO": "LDAP组管理员DN",
"GROUP_SCOPE": "LDAP组搜索范围",
"GROUP_SCOPE_INFO": "搜索范围"
},

1
src/ui_ng/src/styles.css
View File

@ -8,6 +8,7 @@ body {
left: 0;
right:0;
bottom:0;
margin:auto;
width: 108px !important;
height: 108px !important;
}