Browse Source

Fixed nil object error on Meals page

development
Godwin 8 years ago
committed by GitHub
parent
commit
be50d165b3
  1. 2
      app/controllers/conferences_controller.rb

2
app/controllers/conferences_controller.rb

@ -804,7 +804,7 @@ class ConferencesController < ApplicationController
@time = nil @time = nil
@length = 1.5 @length = 1.5
when :meals when :meals
@meals = Hash[@this_conference.meals.map{ |k, v| [k.to_i, v] }].sort.to_h @meals = Hash[(@this_conference.meals || {}).map{ |k, v| [k.to_i, v] }].sort.to_h
when :workshop_times when :workshop_times
get_block_data get_block_data
@workshop_blocks << { @workshop_blocks << {

Loading…
Cancel
Save