update rolify

This commit is contained in:
Stella Rouzi 2016-02-26 18:45:07 +02:00
parent 3dc7aaf4ea
commit 786d2c7985
7 changed files with 24 additions and 24 deletions

View file

@ -217,8 +217,8 @@ module Admin
def get_users(role_name)
@role_users = {}
# Initialize @role variable, so that view can show the role description
@role = Role.where(name: role_name, resource: @conference)
@role.blank? ? @role_users[role_name] = @role : @role_users[role_name] = @role.first.users
@role = Role.find_by(name: role_name, resource: @conference) || []
@role.blank? ? @role_users[role_name] = [] : (@role_users[role_name] = (User.with_role @role.name, @role.resource).to_a)
@role_users
end