Use a partial to render batch sent message

I don’t really like that we’re using two flash keys to make this happen. The @info_request should be available as an InfoRequestBatchTemplate or something in InfoRequestBatch#show so that we can get the law_used_full.
mysociety · Jan 9, 2015 · d8e5a1b · d8e5a1b · crowbot · Jan 9, 2015
1 parent 28a00e5
commit d8e5a1b
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 10 deletions.
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
@@ -244,13 +244,9 @@ def new_batch
                                                       :body => params[:outgoing_message][:body],
                                                       :public_bodies => @public_bodies,
                                                       :user => authenticated_user)
-        flash[:notice] = _("<p>Your {{law_used_full}} requests will be <strong>sent</strong> shortly!</p>
-            <p><strong>We will email you</strong> when they have been sent.
-            We will also email you when there is a response to any of them, or after {{late_number_of_days}} working days if the authorities still haven't
-            replied by then.</p>
-            <p>If you write about these requests (for example in a forum or a blog) please link to this page.</p>",
-            :law_used_full=>@info_request.law_used_full,
-            :late_number_of_days => AlaveteliConfiguration::reply_late_after_days)
+
+        flash[:batch_sent] = true
+        flash[:batch_law_used_full] = @info_request.law_used_full
         redirect_to info_request_batch_path(@info_request_batch)
     end
 

diff --git a/app/views/info_request_batch/_batch_sent.html.erb b/app/views/info_request_batch/_batch_sent.html.erb
@@ -0,0 +1,19 @@
+<div id="notice">
+  <p>
+    <%= _("Your {{law_used_full}} requests will be <strong>sent</strong> shortly!",
+          :law_used_full => law_used_full) %>
+  </p>
+
+  <p>
+    <%= _("<strong>We will email you</strong> when they have been sent. " \
+          "We will also email you when there is a response to any of them, or " \
+          "after {{late_number_of_days}} working days if the authorities still" \
+          "haven't replied by then.",
+          :late_number_of_days => AlaveteliConfiguration::reply_late_after_days) %>
+  </p>
+
+  <p>
+    <%= _("If you write about these requests (for example in a forum or a blog) " \
+          "please link to this page.") %>
+  </p>
+</div>
diff --git a/app/views/info_request_batch/show.html.erb b/app/views/info_request_batch/show.html.erb
@@ -1,4 +1,10 @@
 <% @title = _("{{title}} - a batch request", :title => @info_request_batch.title) %>
+
+<% if flash[:batch_sent] %>
+  <%= render :partial => 'batch_sent',
+             :locals => { :law_used_full => flash[:batch_law_used_full] } %>
+<% end %>
+
 <div class="info_request_batch_intro">
   <h1><%= @title %></h1>
   <% if @info_request_batch.sent_at %>

diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
@@ -2564,10 +2564,15 @@ def make_request
                     assigns[:existing_batch].should_not be_nil
                 end
 
-                it 'should display a success notice' do
+                it 'sets the batch_sent flash to true' do
                     make_request
-                    notice_text = "<p>Your Freedom of Information requests will be <strong>sent</strong> shortly!"
-                    flash[:notice].should match notice_text
+                    expect(flash[:batch_sent]).to be_true
+                end
+
+                it 'sets the batch_law_used_full flash to the law used' do
+                    make_request
+                    expected = assigns[:info_request].law_used_full
+                    expect(flash[:batch_law_used_full]).to eq(expected)
                 end
 
             end