diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-03 10:50:17 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-03 10:50:17 +0100 |
| commit | 050b25bd70909913b7e42d53cb69c31b1396cc46 (patch) | |
| tree | ac2f2b587ffa3504c5cf5164b36f5f436c0582f4 /app/controllers/holiday_controller.rb | |
| parent | 4db18138584b6394286bbe374f22e6609ab79136 (diff) | |
| parent | e30a8623a1706d3bad4476198085547d8f47cc88 (diff) | |
Merge branch 'release/0.11' into wdtk
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 3101c07e3..efc20701d 100644 --- a/app/controllers/holiday_controller.rb +++ b/app/controllers/holiday_controller.rb @@ -2,7 +2,7 @@ # Calculate dates # # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. -# Email: francis@mysociety.org; WWW: http://www.mysociety.org/ +# Email: hello@mysociety.org; WWW: http://www.mysociety.org/ class HolidayController < ApplicationController @@ -12,7 +12,7 @@ class HolidayController < ApplicationController def due_date if params[:holiday] @request_date = Date.strptime(params[:holiday]) or raise "Invalid date" - @due_date = Holiday.due_date_from(@request_date, Configuration::reply_late_after_days, Configuration::working_or_calendar_days) + @due_date = Holiday.due_date_from(@request_date, AlaveteliConfiguration::reply_late_after_days, AlaveteliConfiguration::working_or_calendar_days) @skipped = Holiday.all( :conditions => [ 'day >= ? AND day <= ?', @request_date.strftime("%F"), @due_date.strftime("%F") |