diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-09-24 11:06:04 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-09-24 11:06:04 +0100 |
| commit | 79080b03e56648cccf534c1e6596c65fe68ac07a (patch) | |
| tree | 53e90e96d379734e1ac7ebd497c30f3b281ce506 /app/controllers/holiday_controller.rb | |
| parent | 034e373ad87ec347ae64c0aa5fc42ca204055b2e (diff) | |
| parent | 4cd4eacd7f43536f2b0f4bc9b8eb0fc2445031c5 (diff) | |
Merge remote-tracking branch 'openaustralia_github/calendar_days' into develop
Diffstat (limited to 'app/controllers/holiday_controller.rb')
| -rw-r--r-- | app/controllers/holiday_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/holiday_controller.rb b/app/controllers/holiday_controller.rb index 7f62aa26d..9430c0756 100644 --- a/app/controllers/holiday_controller.rb +++ b/app/controllers/holiday_controller.rb @@ -14,7 +14,9 @@ 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, 20) + days_later = MySociety::Config.get('REPLY_LATE_AFTER_DAYS', 20) + working_or_calendar_days = MySociety::Config.get('WORKING_OR_CALENDAR_DAYS', 'working') + @due_date = Holiday.due_date_from(@request_date, days_later, working_or_calendar_days) @skipped = Holiday.all( :conditions => [ 'day >= ? AND day <= ?', @request_date.strftime("%F"), @due_date.strftime("%F") |