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/channel.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/channel.go')
| -rw-r--r-- | app/channel.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/channel.go b/app/channel.go index ea58795ea..50067d42d 100644 --- a/app/channel.go +++ b/app/channel.go @@ -151,7 +151,7 @@ func (a *App) CreateChannel(channel *model.Channel, addMember bool) (*model.Chan cm := &model.ChannelMember{ ChannelId: sc.Id, UserId: channel.CreatorId, - Roles: model.ROLE_CHANNEL_USER.Id + " " + model.ROLE_CHANNEL_ADMIN.Id, + Roles: model.CHANNEL_USER_ROLE_ID + " " + model.CHANNEL_ADMIN_ROLE_ID, NotifyProps: model.GetDefaultChannelNotifyProps(), } @@ -296,7 +296,7 @@ func (a *App) createGroupChannel(userIds []string, creatorId string) (*model.Cha UserId: user.Id, ChannelId: group.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), - Roles: model.ROLE_CHANNEL_USER.Id, + Roles: model.CHANNEL_USER_ROLE_ID, } if result := <-a.Srv.Store.Channel().SaveMember(cm); result.Err != nil { @@ -514,7 +514,7 @@ func (a *App) addUserToChannel(user *model.User, channel *model.Channel, teamMem ChannelId: channel.Id, UserId: user.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), - Roles: model.ROLE_CHANNEL_USER.Id, + Roles: model.CHANNEL_USER_ROLE_ID, } if result := <-a.Srv.Store.Channel().SaveMember(newMember); result.Err != nil { l4g.Error("Failed to add member user_id=%v channel_id=%v err=%v", user.Id, channel.Id, result.Err) |