lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-310: Share Access now dynamically pulls the list of users from the server (#2380)

Browse Source 
* Share Access now dynamically pulls the list of users from the server

* Merge users now dynamically pulls the list of users from the server

* Only return the information needed to the front-end
This commit is contained in:
Ahmad Farhat
2020-12-21 17:21:17 -05:00
committed by GitHub
parent 155d214215
commit 86e6056d3c
11 changed files with 111 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/ability.rb
View File

@ -37,7 +37,7 @@ class Ability
if highest_role.get_permission("can_manage_users")
can [:index, :edit_user, :promote, :demote, :ban_user, :unban_user,
:approve, :invite, :reset, :undelete, :merge_user], :admin
:approve, :invite, :reset, :undelete, :merge_user, :merge_list], :admin
end
can [:server_recordings, :server_rooms], :admin if highest_role.get_permission("can_manage_rooms_recordings")