diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-04-28 10:11:26 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-04-28 10:11:26 -0400 |
| commit | 514f038f44d2bab1c49e6e374c65fbd6a0517e18 (patch) | |
| tree | 0a350af53c7a25ae113dae04a9d14ac1178d05aa /store/sql_user_store.go | |
| parent | 1b82d98cdbb4e02d7de36c842efd858daaa69406 (diff) | |
| download | chat-514f038f44d2bab1c49e6e374c65fbd6a0517e18.tar.gz chat-514f038f44d2bab1c49e6e374c65fbd6a0517e18.tar.bz2 chat-514f038f44d2bab1c49e6e374c65fbd6a0517e18.zip | |
Fix error not appearing when updating to existing username (#6255)
Diffstat (limited to 'store/sql_user_store.go')
| -rw-r--r-- | store/sql_user_store.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go index b15f349d1..9d981b13e 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -183,9 +183,9 @@ func (us SqlUserStore) Update(user *model.User, trustedUpdateData bool) StoreCha if count, err := us.GetMaster().Update(user); err != nil { if IsUniqueConstraintError(err.Error(), []string{"Email", "users_email_key", "idx_users_email_unique"}) { - result.Err = model.NewLocAppError("SqlUserStore.Update", "store.sql_user.update.email_taken.app_error", nil, "user_id="+user.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlUserStore.Update", "store.sql_user.update.email_taken.app_error", nil, "user_id="+user.Id+", "+err.Error(), http.StatusBadRequest) } else if IsUniqueConstraintError(err.Error(), []string{"Username", "users_username_key", "idx_users_username_unique"}) { - result.Err = model.NewLocAppError("SqlUserStore.Update", "store.sql_user.update.username_taken.app_error", nil, "user_id="+user.Id+", "+err.Error()) + result.Err = model.NewAppError("SqlUserStore.Update", "store.sql_user.update.username_taken.app_error", nil, "user_id="+user.Id+", "+err.Error(), http.StatusBadRequest) } else { result.Err = model.NewLocAppError("SqlUserStore.Update", "store.sql_user.update.updating.app_error", nil, "user_id="+user.Id+", "+err.Error()) } |