mirror of https://github.com/rancher/dashboard.git
ldap component issues
show github info on edit google oauth inputs
This commit is contained in:
parent
9a9c551eb2
commit
85609db2b9
|
|
@ -35,6 +35,7 @@ export function init(store) {
|
|||
name: 'config',
|
||||
weight: 100,
|
||||
route: { name: 'c-cluster-auth-config' },
|
||||
ifHaveType: MANAGEMENT.AUTH_CONFIG
|
||||
});
|
||||
|
||||
spoofedType({
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ export default {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<InfoBox v-if="!model.enabled" class="mt-20 mb-20 p-10">
|
||||
<InfoBox class="mt-20 mb-20 p-10">
|
||||
<ul v-html="t(`authConfig.${NAME}.form.prefix`, tArgs, true)" />
|
||||
<ul>
|
||||
<li>
|
||||
|
|
|
|||
|
|
@ -74,7 +74,8 @@ export default {
|
|||
this.value.port = newDefault;
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
};
|
||||
</script>
|
||||
|
||||
|
|
@ -90,9 +91,11 @@ export default {
|
|||
:value="model.port"
|
||||
type="number"
|
||||
required
|
||||
:min="0"
|
||||
:step="1"
|
||||
:mode="mode"
|
||||
:label="t('authConfig.ldap.port')"
|
||||
@input="e=>model.port = e.replace(/[^0-9]/g, '')"
|
||||
@input="e=>$set(model, 'port', e.replace(/[^0-9]*/g, ''))"
|
||||
/>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ export default {
|
|||
set(this.model, 'accessMode', 'unrestricted');
|
||||
set(this.model, 'starttls', false);
|
||||
if (this.model.id === 'activedirectory') {
|
||||
set(this.model, 'disabledStatusBitmask', 1);
|
||||
set(this.model, 'disabledStatusBitmask', 2);
|
||||
} else {
|
||||
set(this.model, 'disabledStatusBitmask', 0);
|
||||
}
|
||||
|
|
@ -241,10 +241,10 @@ export default {
|
|||
const { oauthCredential, serviceAccountCredential } = this.originalValue;
|
||||
|
||||
if (!this.model.oauthCredential) {
|
||||
this.model.oauthCredential = oauthCredential;
|
||||
set(this.model, 'oauthCredential', oauthCredential);
|
||||
}
|
||||
if (!this.model.serviceAccountCredential) {
|
||||
this.model.serviceAccountCredential = serviceAccountCredential;
|
||||
set(this.model, 'serviceAccountCredential', serviceAccountCredential);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
Loading…
Reference in New Issue