diff options
| -rw-r--r-- | api/user.go | 2 | ||||
| -rw-r--r-- | web/react/components/signup_user_complete.jsx | 11 | ||||
| -rw-r--r-- | web/static/i18n/en.json | 1 |
3 files changed, 13 insertions, 1 deletions
diff --git a/api/user.go b/api/user.go index f814a93fe..8f381aeda 100644 --- a/api/user.go +++ b/api/user.go @@ -796,7 +796,7 @@ func attachDeviceId(c *Context, w http.ResponseWriter, r *http.Request) { return } - w.Write([]byte(deviceId)) + w.Write([]byte(model.MapToJson(props))) } func RevokeSessionById(c *Context, sessionId string) { diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx index 672213d1a..b770a2a2c 100644 --- a/web/react/components/signup_user_complete.jsx +++ b/web/react/components/signup_user_complete.jsx @@ -362,6 +362,17 @@ class SignupUserComplete extends React.Component { ); } + if (signupMessage.length === 0 && !emailSignup) { + emailSignup = ( + <div> + <FormattedMessage + id='signup_user_completed.none' + defaultMessage='No user creation method has been enabled. Please contact an administrator for access.' + /> + </div> + ); + } + return ( <div> <form> diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 1f6d80b08..2ef130894 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -900,6 +900,7 @@ "signup_user_completed.choosePwd": "Choose your password", "signup_user_completed.create": "Create Account", "signup_user_completed.or": "or", + "signup_user_completed.none": "No user creation method has been enabled. Please contact an administrator for access.", "signup_user_completed.welcome": "Welcome to:", "signup_user_completed.onSite": "on {siteName}", "signup_user_completed.lets": "Let's create your account", |