Fixed NPE on schedule
This commit is contained in:
@@ -586,14 +586,16 @@ class ApplicationController < LinguaFrancaApplicationController
|
||||
end
|
||||
|
||||
@events.each do | event |
|
||||
day = event.start_time.midnight.to_date
|
||||
time = event.start_time.hour.to_f + (event.start_time.min / 60.0)
|
||||
@schedule[day] ||= {}
|
||||
@schedule[day][:times] ||= {}
|
||||
@schedule[day][:times][time] ||= {}
|
||||
@schedule[day][:times][time][:type] = :event
|
||||
@schedule[day][:times][time][:length] = (event.end_time - event.start_time) / 3600.0
|
||||
@schedule[day][:times][time][:item] = event
|
||||
if event.present? && event.start_time.present? && event.end_time.present?
|
||||
day = event.start_time.midnight.to_date
|
||||
time = event.start_time.hour.to_f + (event.start_time.min / 60.0)
|
||||
@schedule[day] ||= {}
|
||||
@schedule[day][:times] ||= {}
|
||||
@schedule[day][:times][time] ||= {}
|
||||
@schedule[day][:times][time][:type] = :event
|
||||
@schedule[day][:times][time][:length] = (event.end_time - event.start_time) / 3600.0
|
||||
@schedule[day][:times][time][:item] = event
|
||||
end
|
||||
end
|
||||
|
||||
@schedule = @schedule.sort.to_h
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
= render :partial => 'application/header', :locals => {:image_file => 'parts.jpg'}
|
||||
= row do
|
||||
= columns(medium: 12) do
|
||||
%p= _'error.500.description', :p
|
||||
= render 'contact', cancel_btn: false, contact_reason: :website
|
||||
|
||||
= columns(medium: 12) do
|
||||
%p= _'error.500.description', :p
|
||||
= render 'contact', cancel_btn: false, contact_reason: :website
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
- contact_reason ||= nil
|
||||
- locale ||= nil
|
||||
= form_tag (locale.present? ? contact_send_url : url_for_locale(locale, contact_send_path)), class: 'contact-form' do
|
||||
= emailfield :email, nil, big: true, required: true unless logged_in?
|
||||
- if contact_reason.present?
|
||||
= hidden_field_tag :reason, contact_reason
|
||||
- else
|
||||
= contact_reason_select
|
||||
= textfield :subject, nil, required: true, big: true
|
||||
= textarea :message, nil, required: true, plain: true
|
||||
.actions
|
||||
= button_tag :send, value: :send
|
||||
- if cancel_btn
|
||||
%button.close.subdued=_'forms.actions.generic.cancel'
|
||||
= emailfield :email, nil, big: true, required: true unless logged_in?
|
||||
- if contact_reason.present?
|
||||
= hidden_field_tag :reason, contact_reason
|
||||
- else
|
||||
= contact_reason_select
|
||||
= textfield :subject, nil, required: true, big: true
|
||||
= textarea :message, nil, required: true, plain: true
|
||||
.actions
|
||||
= button_tag :send, value: :send
|
||||
- if cancel_btn
|
||||
%button.close.subdued=_'forms.actions.generic.cancel'
|
||||
|
||||
Reference in New Issue
Block a user