diff options
| -rw-r--r-- | app/controllers/request_controller.rb | 4 | ||||
| -rw-r--r-- | todo.txt | 15 |
2 files changed, 5 insertions, 14 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 98924f0a0..bd89a7db9 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -318,10 +318,10 @@ class RequestController < ApplicationController # Display advice for requester on what to do next, as appropriate if @info_request.calculate_status == 'waiting_response' - flash[:notice] = "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and normally before the end of <strong>" + simple_date(@info_request.date_response_required_by) + "</strong>.</p>" + flash[:notice] = "<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should get a response promptly, and " + (@info_request.public_body.is_school? ? "in term time" : "") + " normally before the end of <strong>" + simple_date(@info_request.date_response_required_by) + "</strong>.</p>" redirect_to request_url(@info_request) elsif @info_request.calculate_status == 'waiting_response_overdue' - flash[:notice] = "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you should have got a response promptly, and normally before the end of <strong>" + simple_date(@info_request.date_response_required_by) + "</strong>.</p>" + flash[:notice] = "<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you should have got a response promptly, and " + (@info_request.public_body.is_school? ? "in term time" : "") + " normally before the end of <strong>" + simple_date(@info_request.date_response_required_by) + "</strong>.</p>" redirect_to request_url(@info_request) elsif @info_request.calculate_status == 'waiting_response_very_overdue' flash[:notice] = "<p>Thank you! Your request is long overdue, by more than 40 working days. Most requests should be answered within 20 working days. You might like to complain about this, see below.</p>" @@ -3,24 +3,15 @@ Search for PICT crash Incoming message 24705 has a badly uuencoded thing due to the bug in escaping backslashes in the database. - -You can unhide the request from search now it is fixed - -Check this works still: +- Upgrad Rails to a newer version even still +- You can unhide the request from search now it is fixed +- Check this works still: s = IncomingMessage.find(2); text = s.get_main_body_text_internal; s.cached_main_body_text = text; s.save! Public interest test ==================== -Do tests - -Check display for schools (of i) request pages, ii) search pages, iii) followup, iv) status set confirmation ) - i) ./request/show.rhtml - ii) ./models/info_request.rb - iii) ./views/request/_followup.rhtml - iv) ./controllers/request_controller.rb - Send email at 40 days models/request_mailer.rb self.alert_overdue_requests models/request_mailer.rb overdue_alert |