Download as
Browse Code »

Commit 08581a0c4af9055a406ea11c401584ece08d3c2d

Authored by Antonio Terceiro
1 parent c09e6cd1
Exists in master and in 21 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, news_page, script_to_update, template_mirror_block, tests, tests_fixies

SearchController: avoid invalid dates 

You cannot use Date.today.day together with arbitrary year/month
combinations, because will crash on 2014-10-31 and you are viewing the
page for 2014-11 (2014-11-31 is not a valid date).
Showing 1 changed file with 8 additions and 4 deletions   Show diff stats
app/controllers/public/search_controller.rb
  Diff comments   View file @08581a0
... ... @@ -90,10 +90,14 @@ class SearchController < PublicController
90 90 end
91 91  
92 92 def events
93   - year = (params[:year] ? params[:year].to_i : Date.today.year)
94   - month = (params[:month] ? params[:month].to_i : Date.today.month)
95   - day = (params[:day] ? params[:day].to_i : Date.today.day)
96   - @date = build_date(year, month, day)
  93 + if params[:year].blank? && params[:year].blank? && params[:day].blank?
  94 + @date = Date.today
  95 + else
  96 + year = (params[:year] ? params[:year].to_i : Date.today.year)
  97 + month = (params[:month] ? params[:month].to_i : Date.today.month)
  98 + day = (params[:day] ? params[:day].to_i : 1)
  99 + @date = build_date(year, month, day)
  100 + end
97 101 date_range = (@date - 1.month).at_beginning_of_month..(@date + 1.month).at_end_of_month
98 102  
99 103 @events = []
... ...