diff options
| -rw-r--r-- | app/models/request_mailer.rb | 6 | ||||
| -rw-r--r-- | app/views/request/_correspondence.rhtml | 4 | ||||
| -rw-r--r-- | app/views/request/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/show_response.rhtml | 4 |
4 files changed, 7 insertions, 9 deletions
diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index 3b95128df..5e663ce90 100644 --- a/app/models/request_mailer.rb +++ b/app/models/request_mailer.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: request_mailer.rb,v 1.42 2008-07-30 13:37:21 francis Exp $ +# $Id: request_mailer.rb,v 1.43 2008-08-26 23:43:42 francis Exp $ class RequestMailer < ApplicationMailer @@ -79,7 +79,7 @@ class RequestMailer < ApplicationMailer else respond_url = show_response_url(:id => info_request.id, :incoming_message_id => last_response.id) end - respond_url = respond_url + "#show_response_followup" + respond_url = respond_url + "#followup" post_redirect = PostRedirect.new( :uri => respond_url, @@ -111,7 +111,7 @@ class RequestMailer < ApplicationMailer # Tell the requester that they need to clarify their request def not_clarified_alert(info_request, incoming_message) respond_url = show_response_url(:id => info_request.id, :incoming_message_id => incoming_message.id) - respond_url = respond_url + "#show_response_followup" + respond_url = respond_url + "#followup" post_redirect = PostRedirect.new( :uri => respond_url, diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml index e71020312..49e2a81cf 100644 --- a/app/views/request/_correspondence.rhtml +++ b/app/views/request/_correspondence.rhtml @@ -18,7 +18,7 @@ if not incoming_message.nil? <p class="event_actions"> <%= link_to "Link to this", incoming_message_url(incoming_message) %> | - <%= link_to "Reply", show_response_url(:id => incoming_message.info_request.id, :incoming_message_id => incoming_message.id) + "#show_response_followup" %> + <%= link_to "Reply", show_response_url(:id => incoming_message.info_request.id, :incoming_message_id => incoming_message.id) + "#followup" %> </p> </div> <% @@ -46,7 +46,7 @@ elsif info_request_event.event_type == 'sent' || info_request_event.event_type = --> <%= link_to "Link to this", outgoing_message_url(outgoing_message) %> | - <%= link_to "Send follow up", show_response_no_followup_url(:id => outgoing_message.info_request.id, :incoming_message_id => nil) + "#show_response_followup" %> + <%= link_to "Send follow up", show_response_no_followup_url(:id => outgoing_message.info_request.id, :incoming_message_id => nil) + "#followup" %> </p> </div> <% elsif [ 'resent', 'followup_resent' ].include?(info_request_event.event_type) %> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index 15d70a8f4..1d395d85e 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -80,7 +80,7 @@ <% if @is_owning_user %> <%=h @info_request.public_body.name %> is <strong>waiting for your clarification</strong>. Please - <%= link_to "send a follow up message", show_response_url(:id => @info_request.id, :incoming_message_id => @info_request.get_last_response.id) + "#show_response_followup" %>. + <%= link_to "send a follow up message", show_response_url(:id => @info_request.id, :incoming_message_id => @info_request.get_last_response.id) + "#followup" %>. <% else %> The request is <strong>waiting for clarification</strong>. If you are diff --git a/app/views/request/show_response.rhtml b/app/views/request/show_response.rhtml index 5c0e18b19..725ee5ba9 100644 --- a/app/views/request/show_response.rhtml +++ b/app/views/request/show_response.rhtml @@ -33,8 +33,6 @@ <%= render :partial => 'correspondence', :locals => { :info_request_event => nil, :incoming_message => @incoming_message } %> <% end %> - <div id="show_response_followup"> - <%= render :partial => 'followup', :locals => { :incoming_message => @incoming_message } %> - </div> + <%= render :partial => 'followup', :locals => { :incoming_message => @incoming_message } %> </div> |