diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 12:55:09 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 12:55:09 +0100 |
| commit | 23816aff9e970e1264b2231757702f648f05e30c (patch) | |
| tree | a286daaa01c1ca2bb5f8ca7035d3370541148f43 /app/controllers/holiday_controller.rb | |
| parent | 8c5a6f4dc2d174ed5190719d952b39720d3bf362 (diff) | |
| parent | 5097146ff016b2aaa9d3dc29f3ec65db0aadbb72 (diff) | |
Merge branch 'develop' into feature/follow-buttons
Conflicts:
app/models/track_mailer.rb
app/models/track_thing.rb
Diffstat (limited to 'app/controllers/holiday_controller.rb')
| -rw-r--r-- | app/controllers/holiday_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/holiday_controller.rb b/app/controllers/holiday_controller.rb index 916ff54c8..7f62aa26d 100644 --- a/app/controllers/holiday_controller.rb +++ b/app/controllers/holiday_controller.rb @@ -1,5 +1,5 @@ # app/controllers/holiday_controller.rb: -# Calculate dates +# Calculate dates # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ @@ -16,7 +16,7 @@ class HolidayController < ApplicationController @request_date = Date.strptime(params[:holiday]) or raise "Invalid date" @due_date = Holiday.due_date_from(@request_date, 20) @skipped = Holiday.all( - :conditions => [ 'day >= ? AND day <= ?', + :conditions => [ 'day >= ? AND day <= ?', @request_date.strftime("%F"), @due_date.strftime("%F") ] ).collect { |h| h.day }.sort |