PLT-4502 Fix SAML user settings password help text (#4484)
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
4824ad1e1a
Коммит
6e7555a575
@@ -473,6 +473,20 @@ export default class SecurityTab extends React.Component {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
} else if (this.props.user.auth_service === Constants.SAML_SERVICE) {
|
||||||
|
inputs.push(
|
||||||
|
<div
|
||||||
|
key='oauthEmailInfo'
|
||||||
|
className='form-group'
|
||||||
|
>
|
||||||
|
<div className='setting-list__hint'>
|
||||||
|
<FormattedMessage
|
||||||
|
id='user.settings.security.passwordSamlCantUpdate'
|
||||||
|
defaultMessage='This field is handled through your login provider. If you want to change it, you need to do so through your login provider.'
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
updateSectionStatus = function resetSection(e) {
|
updateSectionStatus = function resetSection(e) {
|
||||||
@@ -533,7 +547,7 @@ export default class SecurityTab extends React.Component {
|
|||||||
describe = (
|
describe = (
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='user.settings.security.loginGitlab'
|
id='user.settings.security.loginGitlab'
|
||||||
defaultMessage='Login done through Gitlab'
|
defaultMessage='Login done through GitLab'
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
} else if (this.props.user.auth_service === Constants.LDAP_SERVICE) {
|
} else if (this.props.user.auth_service === Constants.LDAP_SERVICE) {
|
||||||
@@ -543,6 +557,13 @@ export default class SecurityTab extends React.Component {
|
|||||||
defaultMessage='Login done through AD/LDAP'
|
defaultMessage='Login done through AD/LDAP'
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
} else if (this.props.user.auth_service === Constants.SAML_SERVICE) {
|
||||||
|
describe = (
|
||||||
|
<FormattedMessage
|
||||||
|
id='user.settings.security.loginSaml'
|
||||||
|
defaultMessage='Login done through SAML'
|
||||||
|
/>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
updateSectionStatus = function updateSection() {
|
updateSectionStatus = function updateSection() {
|
||||||
|
|||||||
@@ -2013,6 +2013,7 @@
|
|||||||
"user.settings.security.ldap": "AD/LDAP",
|
"user.settings.security.ldap": "AD/LDAP",
|
||||||
"user.settings.security.loginGitlab": "Login done through GitLab",
|
"user.settings.security.loginGitlab": "Login done through GitLab",
|
||||||
"user.settings.security.loginLdap": "Login done through AD/LDAP",
|
"user.settings.security.loginLdap": "Login done through AD/LDAP",
|
||||||
|
"user.settings.security.loginSaml": "Login done through SAML",
|
||||||
"user.settings.security.logoutActiveSessions": "View and Logout of Active Sessions",
|
"user.settings.security.logoutActiveSessions": "View and Logout of Active Sessions",
|
||||||
"user.settings.security.method": "Sign-in Method",
|
"user.settings.security.method": "Sign-in Method",
|
||||||
"user.settings.security.newPassword": "New Password",
|
"user.settings.security.newPassword": "New Password",
|
||||||
@@ -2041,6 +2042,7 @@
|
|||||||
"user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
|
"user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
|
||||||
"user.settings.security.passwordGitlabCantUpdate": "Login occurs through GitLab. Password cannot be updated.",
|
"user.settings.security.passwordGitlabCantUpdate": "Login occurs through GitLab. Password cannot be updated.",
|
||||||
"user.settings.security.passwordLdapCantUpdate": "Login occurs through AD/LDAP. Password cannot be updated.",
|
"user.settings.security.passwordLdapCantUpdate": "Login occurs through AD/LDAP. Password cannot be updated.",
|
||||||
|
"user.settings.security.passwordSamlCantUpdate": "This field is handled through your login provider. If you want to change it, you need to do so through your login provider.",
|
||||||
"user.settings.security.passwordMatchError": "The new passwords you entered do not match.",
|
"user.settings.security.passwordMatchError": "The new passwords you entered do not match.",
|
||||||
"user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.",
|
"user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.",
|
||||||
"user.settings.security.retypePassword": "Retype New Password",
|
"user.settings.security.retypePassword": "Retype New Password",
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user