diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-03-05 17:29:32 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-03-05 17:29:32 +1100 |
| commit | 760ad672373427f139eaa37701d607bcd338cb7d (patch) | |
| tree | 5b48157c724488d2b5650f2c1eb820013f0340de /app | |
| parent | 78f2cb7a5d5ffabaf186e70e6fa02e60cbd724bc (diff) | |
Can also record a message when posting to RequestController#describe_state
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/request_controller.rb | 3 | ||||
| -rw-r--r-- | app/views/request_mailer/requires_admin.rhtml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index f2b9150e0..c5788d131 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -407,7 +407,8 @@ class RequestController < ApplicationController end # Make the state change - info_request.set_described_state(params[:incoming_message][:described_state], authenticated_user) + info_request.set_described_state(params[:incoming_message][:described_state], authenticated_user, + params[:incoming_message][:message]) # If you're not the *actual* requester. e.g. you are playing the # classification game, or you're doing this just because you are an diff --git a/app/views/request_mailer/requires_admin.rhtml b/app/views/request_mailer/requires_admin.rhtml index cc056799b..9989f051e 100644 --- a/app/views/request_mailer/requires_admin.rhtml +++ b/app/views/request_mailer/requires_admin.rhtml @@ -1,4 +1,4 @@ -<%= raw @message.strip %> +<%= raw @message %> --------------------------------------------------------------------- <%=@reported_by.name%> <%= _('has reported an')%> <%=@info_request.law_used_short%> |