gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add controller tests for roles

Browse source
This commit is contained in:
Stella Rouzi 2014-08-15 11:37:11 +03:00
parent efc00787fc
commit 88f613ef8c
2 changed files with 136 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/admin/conference_controller.rb
View file

@ -203,24 +203,23 @@ module Admin
@roles = Role::ACTIONABLES + Role::LABELS
params[:user] ? (@selection = params[:user][:roles].parameterize.underscore) : (@selection = 'organizer')
@role = Role.where(name: @selection, resource: @conference)
@role_users = get_users(@selection)
end
def add_user
user = User.find_by(email: params[:user][:email])
@user = User.find_by(email: params[:user][:email])
@selection = params[:role].parameterize.underscore
@role_users = get_users(@selection)
@user.add_role @selection.to_sym, @conference
user.add_role @selection.to_sym, @conference
@role_users = get_users(@selection)
render 'roles', formats: [:js]
end
def remove_user
@selection = params[:role]
@role_users = get_users(@selection)
@user.revoke @selection.to_sym, @conference
@role_users = get_users(@selection)
render 'roles', formats: [:js]
end
@ -228,11 +227,10 @@ module Admin
def get_users(role_name)
@role_users = {}
role = Role.where(name: role_name, resource: @conference)
role.blank? ? @role_users[role_name] = role : @role_users[role_name] = role.first.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_users
end
end