diff options
| author | Chris <ccbrown112@gmail.com> | 2017-11-21 13:08:32 -0600 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-11-21 11:08:32 -0800 |
| commit | 816a30397da6ceff836d8723233dc5cdbda70871 (patch) | |
| tree | d9075e04c6570296cea924b97088839f49d6ce9d /app/import.go | |
| parent | 01e652ed481ed0ef0a8d8c021751655c1a58dd2a (diff) | |
| download | chat-816a30397da6ceff836d8723233dc5cdbda70871.tar.gz chat-816a30397da6ceff836d8723233dc5cdbda70871.tar.bz2 chat-816a30397da6ceff836d8723233dc5cdbda70871.zip | |
Role refactor (#7867)
* role refactor
* add missing file
* fix web test
Diffstat (limited to 'app/import.go')
| -rw-r--r-- | app/import.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/import.go b/app/import.go index 08decb676..850e9c43d 100644 --- a/app/import.go +++ b/app/import.go @@ -572,8 +572,8 @@ func (a *App) ImportUser(data *UserImportData, dryRun bool) *model.AppError { } } else if len(user.Roles) == 0 { // Set SYSTEM_USER roles on newly created users by default. - if user.Roles != model.ROLE_SYSTEM_USER.Id { - roles = model.ROLE_SYSTEM_USER.Id + if user.Roles != model.SYSTEM_USER_ROLE_ID { + roles = model.SYSTEM_USER_ROLE_ID hasUserRolesChanged = true } } @@ -769,7 +769,7 @@ func (a *App) ImportUserTeams(user *model.User, data *[]UserTeamImportData) *mod var roles string if tdata.Roles == nil { - roles = model.ROLE_TEAM_USER.Id + roles = model.TEAM_USER_ROLE_ID } else { roles = *tdata.Roles } @@ -809,7 +809,7 @@ func (a *App) ImportUserChannels(user *model.User, team *model.Team, teamMember var roles string if cdata.Roles == nil { - roles = model.ROLE_CHANNEL_USER.Id + roles = model.CHANNEL_USER_ROLE_ID } else { roles = *cdata.Roles } @@ -1455,7 +1455,7 @@ func (a *App) OldImportPost(post *model.Post) { func (a *App) OldImportUser(team *model.Team, user *model.User) *model.User { user.MakeNonNil() - user.Roles = model.ROLE_SYSTEM_USER.Id + user.Roles = model.SYSTEM_USER_ROLE_ID if result := <-a.Srv.Store.User().Save(user); result.Err != nil { l4g.Error(utils.T("api.import.import_user.saving.error"), result.Err) |