diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-11-16 08:52:33 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-11-16 08:52:33 -0500 |
| commit | 5872a1c094d5cbba49d32b9714d11f0c6b46f552 (patch) | |
| tree | 6307c21ed5cb813dcafb146eb2f5a213a779d31a /store | |
| parent | a3658a1427c29c3052d2c094b676a0cd2a73b4cc (diff) | |
| parent | 7a0597e41b77b5cdd1958889bcd5444bb4a25dea (diff) | |
| download | chat-5872a1c094d5cbba49d32b9714d11f0c6b46f552.tar.gz chat-5872a1c094d5cbba49d32b9714d11f0c6b46f552.tar.bz2 chat-5872a1c094d5cbba49d32b9714d11f0c6b46f552.zip | |
Merge pull request #1426 from mattermost/plt-551
PLT-551 Fix cancel button on username setting and other general improvements
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_user_store.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go index d38b5c214..77ff5bfab 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -157,7 +157,7 @@ func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreCha if count, err := us.GetMaster().Update(user); err != nil { if IsUniqueConstraintError(err.Error(), "Email", "users_email_teamid_key") { - result.Err = model.NewAppError("SqlUserStore.Update", "This email is already taken. Please choose another", "user_id="+user.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlUserStore.Update", "This email is already taken. Please choose another.", "user_id="+user.Id+", "+err.Error()) } else if IsUniqueConstraintError(err.Error(), "Username", "users_username_teamid_key") { result.Err = model.NewAppError("SqlUserStore.Update", "This username is already taken. Please choose another.", "user_id="+user.Id+", "+err.Error()) } else { |