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

Fix for null arrival and departure times in stats.xls

Browse Source
This commit is contained in:
Godwin 2015-09-16 16:33:58 -07:00
parent 0a4e9857ad
commit d34f26c4d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/conferences_controller.rb
View File

@ -471,11 +471,11 @@ class ConferencesController < ApplicationController
@excel_data[:data] << {
:name => user.firstname,
:email => user.email,
:date => r.created_at.strftime("%F %T"),
:date => r.created_at ? r.created_at.strftime("%F %T") : nil,
:city => r.city,
:languages => ((JSON.parse(r.languages || '[]').map { |x| I18n.t"languages.#{x}" }).join(', ').to_s),
:arrival => r.arrival.strftime("%F %T"),
:departure => r.departure.strftime("%F %T"),
:arrival => (r.arrival || @this_conference.start_date).strftime("%F %T"),
:departure => (r.departure || @this_conference.end_date).strftime("%F %T"),
:housing => (I18n.t"articles.conference_registration.questions.housing.#{r.housing || 'none'}"),
:bike => (I18n.t"articles.conference_registration.questions.bike.#{r.bike || 'none'}"),
:food => (I18n.t"articles.conference_registration.questions.food.#{r.food || 'meat'}"),