From 2e0f7e9b423e68237ced37cd1dc470857105cd75 Mon Sep 17 00:00:00 2001 From: hitman Date: Thu, 16 Mar 2017 22:30:03 +0530 Subject: [PATCH] relocate some functions --- app/helpers/application_helper.rb | 22 ++++++++++++++++++++++ app/helpers/events_helper.rb | 14 -------------- app/helpers/paths_helper.rb | 8 -------- app/helpers/users_helper.rb | 8 -------- 4 files changed, 22 insertions(+), 30 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f6f11e00..e3b1a692 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -156,4 +156,26 @@ module ApplicationHelper collection: options_for_select(users.map {|user| ["#{user[1]} (#{user[2]}) #{user[3]}", user[0]]}, @event.speakers.map(&:id)), include_blank: false, label: 'Speakers', input_html: { class: 'select-help-toggle', multiple: 'true' } end + + def event_types(conference) + all = conference.program.event_types.map { |et| et.title.pluralize } + first = all[0...-1] + last = all[-1] + ets = '' + if all.length > 1 + ets << first.join(', ') + ets << " and #{last}" + else + ets = all.join + end + ets + end + + def sign_in_path + if ENV['OSEM_ICHAIN_ENABLED'] == 'true' + new_user_ichain_session_path + else + new_user_session_path + end + end end diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 8f078db1..012bd930 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -22,20 +22,6 @@ module EventsHelper end end - def event_types(conference) - all = conference.program.event_types.map { |et| et.title.pluralize } - first = all[0...-1] - last = all[-1] - ets = '' - if all.length > 1 - ets << first.join(', ') - ets << " and #{last}" - else - ets = all.join - end - ets - end - def replacement_event_notice(event_schedule) if event_schedule.present? && event_schedule.replacement? replaced_event = (event_schedule.intersecting_event_schedules.withdrawn.first || event_schedule.intersecting_event_schedules.canceled.first).event diff --git a/app/helpers/paths_helper.rb b/app/helpers/paths_helper.rb index 3633292a..50bedfb6 100644 --- a/app/helpers/paths_helper.rb +++ b/app/helpers/paths_helper.rb @@ -15,14 +15,6 @@ module PathsHelper end end - def sign_in_path - if ENV['OSEM_ICHAIN_ENABLED'] == 'true' - new_user_ichain_session_path - else - new_user_session_path - end - end - def active_nav_li(link) if current_page?(link) return 'active' diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 916fcb63..e2fd1349 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -28,14 +28,6 @@ module UsersHelper roles.map{ |x| x[0].titleize + ' (' + x[1].join(', ') + ')' }.join ', ' end - def can_manage_volunteers(conference) - if (current_user.has_role? :organizer, conference) || (current_user.has_role? :volunteers_coordinator, conference) - true - else - false - end - end - def user_change_description(version) if version.event == 'create' link_to_user(version.item_id) + ' signed up'