From b36d02ceec940ed58f3e046fe6662d86f0e2c4dd Mon Sep 17 00:00:00 2001 From: hitman Date: Fri, 17 Mar 2017 18:50:29 +0530 Subject: [PATCH] change to can_manage_volunteers? --- app/controllers/admin/volunteers_controller.rb | 4 ++-- app/helpers/admin/volunteers_helper.rb | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/controllers/admin/volunteers_controller.rb b/app/controllers/admin/volunteers_controller.rb index a6ce367b..e8676bae 100644 --- a/app/controllers/admin/volunteers_controller.rb +++ b/app/controllers/admin/volunteers_controller.rb @@ -4,7 +4,7 @@ module Admin load_and_authorize_resource :conference, find_by: :short_title def index - if can_manage_volunteers(@conference) + if can_manage_volunteers?(@conference) render :index else authorize! :index, :volunteer @@ -12,7 +12,7 @@ module Admin end def show - if can_manage_volunteers(@conference) + if can_manage_volunteers?(@conference) if @conference.use_vpositions @volunteers = @conference.registrations.joins(:vchoices).uniq else diff --git a/app/helpers/admin/volunteers_helper.rb b/app/helpers/admin/volunteers_helper.rb index d71719db..f29c65fe 100644 --- a/app/helpers/admin/volunteers_helper.rb +++ b/app/helpers/admin/volunteers_helper.rb @@ -1,11 +1,7 @@ module Admin module VolunteersHelper - def can_manage_volunteers(conference) - if (current_user.has_role? :organizer, conference) || (current_user.has_role? :volunteers_coordinator, conference) - true - else - false - end + def can_manage_volunteers?(conference) + !!(current_user.has_role? :organizer, conference) || (current_user.has_role? :volunteers_coordinator, conference) end end end