diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-07-08 09:07:47 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-07-08 09:07:47 -0400 |
| commit | 3012a7f532815bf0b77d3a595712221cc6efc047 (patch) | |
| tree | 5df8a672d7c60b3204496d0f3f8b2b2ce3fba7fc /store | |
| parent | 450821bcbae2769bf616405401cd3020f7686820 (diff) | |
| parent | e3ab0a4e3ddb4b1bfacd2b82073c4a48e58751d6 (diff) | |
| download | chat-3012a7f532815bf0b77d3a595712221cc6efc047.tar.gz chat-3012a7f532815bf0b77d3a595712221cc6efc047.tar.bz2 chat-3012a7f532815bf0b77d3a595712221cc6efc047.zip | |
Merge pull request #136 from mattermost/code-review
team code review
Diffstat (limited to 'store')
| -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 bcaff1487..fc3d125c4 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -95,7 +95,7 @@ func (us SqlUserStore) Save(user *model.User) StoreChannel { return storeChannel } -func (us SqlUserStore) Update(user *model.User, allowRoleActiveUpdate bool) StoreChannel { +func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreChannel { storeChannel := make(StoreChannel) @@ -125,7 +125,7 @@ func (us SqlUserStore) Update(user *model.User, allowRoleActiveUpdate bool) Stor user.LastPingAt = oldUser.LastPingAt user.EmailVerified = oldUser.EmailVerified - if !allowRoleActiveUpdate { + if !allowActiveUpdate { user.Roles = oldUser.Roles user.DeleteAt = oldUser.DeleteAt } |