diff options
author | Jesús Espino <jespinog@gmail.com> | 2018-05-29 16:58:12 +0200 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2018-05-29 15:58:12 +0100 |
commit | e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8 (patch) | |
tree | 480a5b91b37e2728ea151e3b7ad521aaf4402697 /model | |
parent | bf4cefc3496686850757b2d44219ea2425871dda (diff) | |
download | chat-e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8.tar.gz chat-e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8.tar.bz2 chat-e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8.zip |
MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)
* MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions
* MM-8853: Removing unnecesary emoji enterprise feature
* Create emojis migration
* Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS always to system admins
* Simplifing permissions checks
* Revert "Simplifing permissions checks"
This reverts commit e2cafc1905fc9e20125dd9a1552d2d0c7340ae59.
Diffstat (limited to 'model')
-rw-r--r-- | model/permission.go | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/model/permission.go b/model/permission.go index 792c7d42e..737321cc7 100644 --- a/model/permission.go +++ b/model/permission.go @@ -50,6 +50,8 @@ var PERMISSION_MANAGE_WEBHOOKS *Permission var PERMISSION_MANAGE_OTHERS_WEBHOOKS *Permission var PERMISSION_MANAGE_OAUTH *Permission var PERMISSION_MANAGE_SYSTEM_WIDE_OAUTH *Permission +var PERMISSION_MANAGE_EMOJIS *Permission +var PERMISSION_MANAGE_OTHERS_EMOJIS *Permission var PERMISSION_CREATE_POST *Permission var PERMISSION_CREATE_POST_PUBLIC *Permission var PERMISSION_CREATE_POST_EPHEMERAL *Permission @@ -286,6 +288,18 @@ func initializePermissions() { "authentication.permissions.manage_system_wide_oauth.description", PERMISSION_SCOPE_SYSTEM, } + PERMISSION_MANAGE_EMOJIS = &Permission{ + "manage_emojis", + "authentication.permissions.manage_emojis.name", + "authentication.permissions.manage_emojis.description", + PERMISSION_SCOPE_TEAM, + } + PERMISSION_MANAGE_OTHERS_EMOJIS = &Permission{ + "manage_others_emojis", + "authentication.permissions.manage_others_emojis.name", + "authentication.permissions.manage_others_emojis.description", + PERMISSION_SCOPE_TEAM, + } PERMISSION_CREATE_POST = &Permission{ "create_post", "authentication.permissions.create_post.name", @@ -424,6 +438,8 @@ func initializePermissions() { PERMISSION_MANAGE_OTHERS_WEBHOOKS, PERMISSION_MANAGE_OAUTH, PERMISSION_MANAGE_SYSTEM_WIDE_OAUTH, + PERMISSION_MANAGE_EMOJIS, + PERMISSION_MANAGE_OTHERS_EMOJIS, PERMISSION_CREATE_POST, PERMISSION_CREATE_POST_PUBLIC, PERMISSION_CREATE_POST_EPHEMERAL, |