diff options
| author | David Meza <dmeza@users.noreply.github.com> | 2017-09-01 13:21:09 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-09-01 14:21:09 -0400 |
| commit | b6456a675d140d6d80eb0874a5b6a89008e28eaa (patch) | |
| tree | 2f90acc82dd3565a0c9f86608a73dd59d5ca0d80 /model | |
| parent | df94be8f3775ec63bbb896070c0565f733fd3033 (diff) | |
| download | chat-b6456a675d140d6d80eb0874a5b6a89008e28eaa.tar.gz chat-b6456a675d140d6d80eb0874a5b6a89008e28eaa.tar.bz2 chat-b6456a675d140d6d80eb0874a5b6a89008e28eaa.zip | |
Add x to be able to leave public and private channels (#7145)
* Add config value EnableXToLeaveChannelsFromLHS that if true displays x to the right of private and public channels on the LHS.
* Displays x to the right of private and public channels on the LHS based on if EnableXToLeaveChannelsFromLHS=true.
* change the tooltip for private and public channels to `Leave channel`
* Add client-side event for when user clicks the "x" button. Different for public, private, DM.
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go index 58b3da4d1..a801f7f99 100644 --- a/model/config.go +++ b/model/config.go @@ -350,6 +350,7 @@ type TeamSettings struct { RestrictPublicChannelDeletion *string RestrictPrivateChannelDeletion *string RestrictPrivateChannelManageMembers *string + EnableXToLeaveChannelsFromLHS *bool UserStatusAwayTimeout *int64 MaxChannelsPerTeam *int64 MaxNotificationsPerChannel *int64 @@ -810,6 +811,11 @@ func (o *Config) SetDefaults() { *o.TeamSettings.RestrictPrivateChannelManageMembers = PERMISSIONS_ALL } + if o.TeamSettings.EnableXToLeaveChannelsFromLHS == nil { + o.TeamSettings.EnableXToLeaveChannelsFromLHS = new(bool) + *o.TeamSettings.EnableXToLeaveChannelsFromLHS = false + } + if o.TeamSettings.UserStatusAwayTimeout == nil { o.TeamSettings.UserStatusAwayTimeout = new(int64) *o.TeamSettings.UserStatusAwayTimeout = TEAM_SETTINGS_DEFAULT_USER_STATUS_AWAY_TIMEOUT |