gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

relocate some functions

Browse source
This commit is contained in:
hitman 2017-03-16 22:30:03 +05:30 • committed by Stella Rouzi
parent 5b1a730e19
commit 2e0f7e9b42
4 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/helpers/application_helper.rb
View file

@ -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)), 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' } include_blank: false, label: 'Speakers', input_html: { class: 'select-help-toggle', multiple: 'true' }
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 sign_in_path
if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
new_user_ichain_session_path
else
new_user_session_path
end
end
end end

14
app/helpers/events_helper.rb
View file

@ -22,20 +22,6 @@ module EventsHelper
end end
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) def replacement_event_notice(event_schedule)
if event_schedule.present? && event_schedule.replacement? if event_schedule.present? && event_schedule.replacement?
replaced_event = (event_schedule.intersecting_event_schedules.withdrawn.first || event_schedule.intersecting_event_schedules.canceled.first).event replaced_event = (event_schedule.intersecting_event_schedules.withdrawn.first || event_schedule.intersecting_event_schedules.canceled.first).event

8
app/helpers/paths_helper.rb
View file

@ -15,14 +15,6 @@ module PathsHelper
end end
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) def active_nav_li(link)
if current_page?(link) if current_page?(link)
return 'active' return 'active'

8
app/helpers/users_helper.rb
View file

@ -28,14 +28,6 @@ module UsersHelper
roles.map{ |x| x[0].titleize + ' (' + x[1].join(', ') + ')' }.join ', ' roles.map{ |x| x[0].titleize + ' (' + x[1].join(', ') + ')' }.join ', '
end 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) def user_change_description(version)
if version.event == 'create' if version.event == 'create'
link_to_user(version.item_id) + ' signed up' link_to_user(version.item_id) + ' signed up'