diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-09-13 12:42:48 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-09-13 12:42:48 -0400 |
| commit | 1e7985a87a72bea9a308cf1506dacc828c6e2e1c (patch) | |
| tree | d4251391dc74a9ff4628dd1bed551c34d806a1b6 /model/channel_member.go | |
| parent | 05af5d14b8d07b010c70750ae1ac5ddf22c120a7 (diff) | |
| download | chat-1e7985a87a72bea9a308cf1506dacc828c6e2e1c.tar.gz chat-1e7985a87a72bea9a308cf1506dacc828c6e2e1c.tar.bz2 chat-1e7985a87a72bea9a308cf1506dacc828c6e2e1c.zip | |
Modifying permissions system. (#3897)
Diffstat (limited to 'model/channel_member.go')
| -rw-r--r-- | model/channel_member.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/model/channel_member.go b/model/channel_member.go index 66e20da64..705c6bfbd 100644 --- a/model/channel_member.go +++ b/model/channel_member.go @@ -10,7 +10,6 @@ import ( ) const ( - CHANNEL_ROLE_ADMIN = "admin" CHANNEL_NOTIFY_DEFAULT = "default" CHANNEL_NOTIFY_ALL = "all" CHANNEL_NOTIFY_MENTION = "mention" @@ -60,12 +59,6 @@ func (o *ChannelMember) IsValid() *AppError { return NewLocAppError("ChannelMember.IsValid", "model.channel_member.is_valid.user_id.app_error", nil, "") } - for _, role := range strings.Split(o.Roles, " ") { - if !(role == "" || role == CHANNEL_ROLE_ADMIN) { - return NewLocAppError("ChannelMember.IsValid", "model.channel_member.is_valid.role.app_error", nil, "role="+role) - } - } - notifyLevel := o.NotifyProps["desktop"] if len(notifyLevel) > 20 || !IsChannelNotifyLevelValid(notifyLevel) { return NewLocAppError("ChannelMember.IsValid", "model.channel_member.is_valid.notify_level.app_error", @@ -89,6 +82,10 @@ func (o *ChannelMember) PreUpdate() { o.LastUpdateAt = GetMillis() } +func (o *ChannelMember) GetRoles() []string { + return strings.Fields(o.Roles) +} + func IsChannelNotifyLevelValid(notifyLevel string) bool { return notifyLevel == CHANNEL_NOTIFY_DEFAULT || notifyLevel == CHANNEL_NOTIFY_ALL || |