From e5471e09cdf2fd43e4aac3ad1137fdf14bcd93d2 Mon Sep 17 00:00:00 2001 From: "girish@cloudron.io" Date: Tue, 19 Jan 2016 12:23:24 -0800 Subject: Check auth_service to describe user login message --- web/react/components/user_settings/user_settings_general.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react/components/user_settings/user_settings_general.jsx') diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx index 014038dd4..d3bde6e96 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -531,7 +531,7 @@ export default class UserSettingsGeneralTab extends React.Component { } else { describe = UserStore.getCurrentUser().email; } - } else { + } else if (this.props.user.auth_service === Constants.GITLAB_SERVICE) { describe = 'Log in done through GitLab'; } -- cgit v1.2.3-1-g7c22 From 6f866f8c03dd4c3bdb8f1abddd10458d4ed2eb3c Mon Sep 17 00:00:00 2001 From: "girish@cloudron.io" Date: Tue, 19 Jan 2016 13:12:10 -0800 Subject: Check auth_service for constructing message --- web/react/components/user_settings/user_settings_general.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react/components/user_settings/user_settings_general.jsx') diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx index d3bde6e96..75a0e6b6a 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -493,7 +493,7 @@ export default class UserSettingsGeneralTab extends React.Component { ); submit = this.submitEmail; - } else { + } else if (this.props.user.auth_service === Constants.GITLAB_SERVICE) { inputs.push(
Date: Tue, 19 Jan 2016 12:39:51 -0800 Subject: Removed extraneous error when providing a short username --- web/react/components/user_settings/user_settings_general.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react/components/user_settings/user_settings_general.jsx') diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx index 014038dd4..db8cd277d 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -47,7 +47,7 @@ export default class UserSettingsGeneralTab extends React.Component { this.setState({clientError: 'This username is reserved, please choose a new one.'}); return; } else if (usernameError) { - this.setState({clientError: "Username must begin with a letter, and contain between 3 to 15 lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'."}); + this.setState({clientError: 'Username must begin with a letter, and contain between ' + Constants.MIN_USERNAME_LENGTH + ' to ' + Constants.MAX_USERNAME_LENGTH + " lowercase characters made up of numbers, letters, and the symbols '.', '-' and '_'."}); return; } -- cgit v1.2.3-1-g7c22