diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 11:29:58 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 11:29:58 +0100 |
| commit | 362b1cfdab4115478034e004c85001bb6d7abd68 (patch) | |
| tree | aff7422269c160ab15277e7913646aed1ca32bb5 /app/controllers/holiday_controller.rb | |
| parent | 4593cc9e546878d69f795ce75808aae60656213c (diff) | |
| parent | 95e7cd60a2ff78aa8550dc1855ee7c01a0f4c6f2 (diff) | |
Merge branch 'develop' into feature/fix-404-in-themes
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 |