bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Fixed conflit error where workshops would have errors with themselves

Browse Source
This commit is contained in:
Godwin 2015-09-29 23:01:29 -07:00
parent 9ca712ebc7
commit ec03ff3959
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/schedule_helper.rb
View File

@ -37,8 +37,8 @@ module ScheduleHelper
if conflict.present? if conflict.present?
w_conflict = get_workshop(conflict, @workshops, @events) w_conflict = get_workshop(conflict, @workshops, @events)
workshop_errors[(w_conflict.is_a?(Workshop) ? 'w' : 'e') + w_conflict.id.to_s] = "Time conflict with &ldquo;<strong>#{w_conflict.title}</strong>&rdquo;".html_safe workshop_errors[(w_conflict.is_a?(Workshop) ? 'w' : 'e') + w_conflict.id.to_s] = "Time conflict with &ldquo;<strong>#{w.title}</strong>&rdquo;".html_safe
workshop_errors[(w.is_a?(Workshop) ? 'w' : 'e') + w.id.to_s] = "Time conflict with &ldquo;<strong>#{w.title}</strong>&rdquo;".html_safe workshop_errors[(w.is_a?(Workshop) ? 'w' : 'e') + w.id.to_s] = "Time conflict with &ldquo;<strong>#{w_conflict.title}</strong>&rdquo;".html_safe
errors += 1 if workshop_errors[(w_conflict.is_a?(Workshop) ? 'w' : 'e') + w_conflict.id.to_s].nil? errors += 1 if workshop_errors[(w_conflict.is_a?(Workshop) ? 'w' : 'e') + w_conflict.id.to_s].nil?
else else
schedule[day][:start_time] = hour if schedule[day][:start_time].nil? || hour < schedule[day][:start_time] schedule[day][:start_time] = hour if schedule[day][:start_time].nil? || hour < schedule[day][:start_time]