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

change to can_manage_volunteers?

Browse source
This commit is contained in:
hitman 2017-03-17 18:50:29 +05:30 • committed by Stella Rouzi
parent 85fa39870d
commit b36d02ceec
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/volunteers_controller.rb
View file

@ -4,7 +4,7 @@ module Admin
load_and_authorize_resource :conference, find_by: :short_title load_and_authorize_resource :conference, find_by: :short_title
def index def index
if can_manage_volunteers(@conference) if can_manage_volunteers?(@conference)
render :index render :index
else else
authorize! :index, :volunteer authorize! :index, :volunteer
@ -12,7 +12,7 @@ module Admin
end end
def show def show
if can_manage_volunteers(@conference) if can_manage_volunteers?(@conference)
if @conference.use_vpositions if @conference.use_vpositions
@volunteers = @conference.registrations.joins(:vchoices).uniq @volunteers = @conference.registrations.joins(:vchoices).uniq
else else

8
app/helpers/admin/volunteers_helper.rb
View file

@ -1,11 +1,7 @@
module Admin module Admin
module VolunteersHelper module VolunteersHelper
def can_manage_volunteers(conference) def can_manage_volunteers?(conference)
if (current_user.has_role? :organizer, conference) || (current_user.has_role? :volunteers_coordinator, conference) !!(current_user.has_role? :organizer, conference) || (current_user.has_role? :volunteers_coordinator, conference)
true
else
false
end
end end
end end
end end