diff options
author | JoramWilander <jwawilander@gmail.com> | 2016-05-27 14:38:41 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2016-05-27 14:38:41 -0400 |
commit | 6f8d4a18eecfa9f0b8e817e75555e447d33faeb2 (patch) | |
tree | 2c4afbea82b27491cad87a9881b0d907667be886 /mattermost.go | |
parent | a9a0e1f6db7384c22c2dba7dbb95c385590c2c61 (diff) | |
parent | cb745475452a9fc8ef3a9fedf6b34af7d05adba9 (diff) | |
download | chat-6f8d4a18eecfa9f0b8e817e75555e447d33faeb2.tar.gz chat-6f8d4a18eecfa9f0b8e817e75555e447d33faeb2.tar.bz2 chat-6f8d4a18eecfa9f0b8e817e75555e447d33faeb2.zip |
Merge branch 'release-3.0'
Diffstat (limited to 'mattermost.go')
-rw-r--r-- | mattermost.go | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/mattermost.go b/mattermost.go index 85263e737..44eed457d 100644 --- a/mattermost.go +++ b/mattermost.go @@ -542,6 +542,7 @@ func convertTeamTo30(primaryTeamName string, team *TeamForUpgrade, uniqueEmails for _, user := range users { shouldUpdateUser := false + shouldUpdateRole := false previousRole := user.Roles previousEmail := user.Email previousUsername := user.Username @@ -554,7 +555,7 @@ func convertTeamTo30(primaryTeamName string, team *TeamForUpgrade, uniqueEmails if model.IsInRole(user.Roles, model.ROLE_TEAM_ADMIN) { member.Roles = model.ROLE_TEAM_ADMIN user.Roles = "" - shouldUpdateUser = true + shouldUpdateRole = true } exists := false @@ -668,6 +669,25 @@ func convertTeamTo30(primaryTeamName string, team *TeamForUpgrade, uniqueEmails } } + if shouldUpdateRole { + if _, err := store.GetMaster().Exec(` + UPDATE Users + SET + Roles = '' + WHERE + Id = :Id + `, + map[string]interface{}{ + "Id": user.Id, + }, + ); err != nil { + l4g.Error("Failed to update user role %v details=%v", user.Email, err) + flushLogAndExit(1) + } + + l4g.Info("modified user_id=%v, changed roles from=%v to=%v", user.Id, previousRole, user.Roles) + } + uniqueEmails[user.Email] = true uniqueUsernames[user.Username] = true |