Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-06-24 13:55:05 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7713 from jwangyangls/fix_configration_bug

Browse Source 
Move redirectUrl tip,fix pattern with endpoint,fix incorrect tip message for invalid input of OIDC scope
This commit is contained in:
jwangyangls 2019-05-08 10:57:58 +08:00 committed by GitHub
commit 37c024621e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/portal/src/app/config/auth/config-auth.component.html
View File

@ -322,7 +322,6 @@
</section>
<section class="form-block" *ngIf="showOIDC">
<div class="oidc-tip">{{ 'CONFIG.OIDC.OIDC_REDIREC_URL' | translate}} <span>{{redirectUrl}}/c/oidc/callback</span></div>
<div class="form-group">
<label for="oidcName" class="required">{{'CONFIG.OIDC.OIDC_PROVIDER' | translate}}</label>
<label for="oidcName" aria-haspopup="true" role="tooltip"
@ -348,7 +347,7 @@
class="tooltip tooltip-validation tooltip-lg tooltip-top-right">
<input name="oidcEndpoint" type="text" #oidcEndpointInput="ngModel" required
[(ngModel)]="currentConfig.oidc_endpoint.value" id="oidcEndpoint" size="40"
[disabled]="disabled(currentConfig.oidc_endpoint)" pattern="^([hH][tT]{2}[pP][sS])(.*?)*$">
[disabled]="disabled(currentConfig.oidc_endpoint)" pattern="^([hH][tT]{2}[pP][sS]:\/\/)(.*?)*$">
<span class="tooltip-content">
{{'TOOLTIP.OIDC_ENDPOIT_FORMAT' | translate}}
</span>
@ -394,7 +393,7 @@
[(ngModel)]="currentConfig.oidc_scope.value" id="oidcScope" size="40" required
[disabled]="disabled(currentConfig.oidc_scope)" pattern="^(\w+,){0,}openid(,\w+){0,}$">
<span class="tooltip-content">
{{'TOOLTIP.ITEM_REQUIRED' | translate}}
{{'TOOLTIP.SCOPE_REQUIRED' | translate}}
</span>
</label>
<a href="javascript:void(0)" role="tooltip" aria-haspopup="true"
@ -416,6 +415,7 @@
<span class="tooltip-content">{{'TOOLTIP.OIDC_VERIFYCERT' | translate}}</span>
</a>
</div>
<div class="oidc-tip">{{ 'CONFIG.OIDC.OIDC_REDIREC_URL' | translate}} <span>{{redirectUrl}}/c/oidc/callback</span></div>
</section>
</form>
<div>

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

@ -16,7 +16,5 @@ clr-tooltip {
top: -5px;
}
.oidc-tip {
position: absolute;
top: 170px;
color: rgb(210, 74, 112);
color: rgb(10, 74, 112);
}

1
src/portal/src/i18n/lang/en-us-lang.json
View File

@ -75,6 +75,7 @@
"SIGN_UP_MAIL": "Email is only used for resetting your password.",
"SIGN_UP_REAL_NAME": "First and last name",
"ITEM_REQUIRED": "Field is required.",
"SCOPE_REQUIRED": "Field is required and should be in scope format.",
"NUMBER_REQUIRED": "Field is required and should be numbers.",
"PORT_REQUIRED": "Field is required and should be valid port number.",
"CRON_REQUIRED": "Field is required and should be in cron format.",

1
src/portal/src/i18n/lang/es-es-lang.json
View File

@ -75,6 +75,7 @@
"SIGN_UP_MAIL": "La dirección de email solamente se utilizar para restablecer la contraseña.",
"SIGN_UP_REAL_NAME": "Nombre y apellidos",
"ITEM_REQUIRED": "Campo obligatorio.",
"SCOPE_REQUIRED": "Field is required and should be in scope format.",
"NUMBER_REQUIRED": "El campo es obligatorio y debería ser un número.",
"PORT_REQUIRED": "El campo es obligatorio y debería ser un número de puerto válido.",
"CRON_REQUIRED": "El campo es obligatorio y debe estar en formato cron.",

1
src/portal/src/i18n/lang/fr-fr-lang.json
View File

@ -72,6 +72,7 @@
"SIGN_UP_MAIL": "L'email n'est utilisé que pour réinitialiser votre mot de passe.",
"SIGN_UP_REAL_NAME": "Prénom et nom",
"ITEM_REQUIRED": "Le champ est obligatoire.",
"SCOPE_REQUIRED": "Field is required and should be in scope format.",
"NUMBER_REQUIRED": "Le champ est obligatoire et doit être numérique.",
"PORT_REQUIRED": "Le champ est obligatoire et doit être un numéro de port valide.",
"CRON_REQUIRED": "Le champ est obligatoire et doit être au format cron.",

1
src/portal/src/i18n/lang/pt-br-lang.json
View File

@ -75,6 +75,7 @@
"SIGN_UP_MAIL": "Email é apenas utilizado para redefinir a senha.",
"SIGN_UP_REAL_NAME": "Primeiro e último nome",
"ITEM_REQUIRED": "Campo é obrigatório.",
"SCOPE_REQUIRED": "Field is required and should be in scope format.",
"NUMBER_REQUIRED": "Campo é obrigatório e deve ser numerico.",
"PORT_REQUIRED": "Campo é obrigatório e deve ser um número de porta válido.",
"CRON_REQUIRED": "O campo é obrigatório e deve estar no formato cron.",

1
src/portal/src/i18n/lang/zh-cn-lang.json
View File

@ -75,6 +75,7 @@
"SIGN_UP_MAIL": "邮件地址仅用来重置您的密码。",
"SIGN_UP_REAL_NAME": "全名",
"ITEM_REQUIRED": "此项为必填项。",
"SCOPE_REQUIRED": "此项为必填项且为scope格式。",
"NUMBER_REQUIRED": "此项为必填项且为数字。",
"PORT_REQUIRED": "此项为必填项且为合法端口号。",
"CRON_REQUIRED": "此项为必填项且为cron格式。",