aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2011-09-15 11:59:58 +0100
committerSeb Bacon <seb.bacon@gmail.com>2011-09-15 12:07:04 +0100
commit9aaf2baf65cedabd5f0ca7b5d91a77c47a25b11b (patch)
treee4ff702f290edbbc153f20c4d3d306a23e8cd152
parentcb4eea88d6d7a7c74daaa594c2b677b5f209a3b8 (diff)
Fix test failures resulting from commit 0f0854cd60aebde1b4a69e455ee40686c4ab0353
-rw-r--r--app/views/request/_followup.rhtml7
-rw-r--r--public/stylesheets/theme.css4
-rw-r--r--spec/views/request/_after_actions.rhtml_spec.rb27
3 files changed, 7 insertions, 31 deletions
diff --git a/app/views/request/_followup.rhtml b/app/views/request/_followup.rhtml
index 4de2ce853..be57ac9ef 100644
--- a/app/views/request/_followup.rhtml
+++ b/app/views/request/_followup.rhtml
@@ -1,8 +1,3 @@
-<style>
- p.event_actions {
- display: none;
- }
-</style>
<div id="followup">
<% if (incoming_message.nil? || !incoming_message.valid_to_reply_to?)
name_for_followup = _("the main FOI contact at {{public_body}}", :public_body => h(OutgoingMailer.name_for_followup(@info_request, nil)))
@@ -35,6 +30,8 @@
<% else %>
<li><%= link_to name, show_response_url(:id => @info_request.id, :incoming_message_id => id)%></li>
<% end %>
+ <% else %>
+ <li><%= link_to(_("the main FOI contact address for {{public_body}}", :public_body => name), show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil)) %></li>
<% end %>
<% end %>
diff --git a/public/stylesheets/theme.css b/public/stylesheets/theme.css
index 4b7b1b2f0..f79a22771 100644
--- a/public/stylesheets/theme.css
+++ b/public/stylesheets/theme.css
@@ -1125,4 +1125,8 @@ div.correspondence p.preview_subject strong {
#preview_form ul li {
margin: 10px 0px;
+}
+
+div#show_response_view p.event_actions {
+ display: none;
} \ No newline at end of file
diff --git a/spec/views/request/_after_actions.rhtml_spec.rb b/spec/views/request/_after_actions.rhtml_spec.rb
index a92ef2dda..c73f35d33 100644
--- a/spec/views/request/_after_actions.rhtml_spec.rb
+++ b/spec/views/request/_after_actions.rhtml_spec.rb
@@ -79,30 +79,5 @@ describe 'when displaying actions that can be taken with regard to a request' do
it 'should display a link for the request owner to request a review' do
expect_owner_link('Request an internal review')
end
-
- describe 'when there is no last response' do
-
- before do
- assigns[:last_response] = nil
- end
-
- it 'should display a link for the request owner to send a follow up' do
- expect_owner_link('Send follow up to test public body')
- end
-
- end
-
- describe 'when there is a last response' do
- before do
- assigns[:last_response] = mock_model(IncomingMessage,
- :valid_to_reply_to? => false)
- end
-
- it 'should display a link for the request owner to reply to the last response' do
- expect_owner_link('Reply to test public body')
- end
-
- end
-
-end \ No newline at end of file
+end