diff options
| author | David Cabo <david@calibea.com> | 2012-05-28 12:58:02 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2012-05-28 12:58:02 +0200 |
| commit | bc681f7270f5ddc40279981a15a0a7c7af250293 (patch) | |
| tree | 5df68fe9a0a756d9821c560079271ed363bd3f18 /app/controllers/holiday_controller.rb | |
| parent | ba29eab41f51f3f489be7c5daf6d28449eab944f (diff) | |
| parent | acde8a57e087d3058b8539e04c12e790866f8451 (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
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 |