squash! d8e5a1b

mysociety · Jan 9, 2015 · 2372441 · 2372441
1 parent d8e5a1b
commit 2372441
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
@@ -246,7 +246,6 @@ def new_batch
                                                       :user => authenticated_user)
 
         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
@@ -1,7 +1,6 @@
 <div id="notice">
   <p>
-    <%= _("Your {{law_used_full}} requests will be <strong>sent</strong> shortly!",
-          :law_used_full => law_used_full) %>
+    <%= _("Your requests will be <strong>sent</strong> shortly!") %>
   </p>
 
   <p>

diff --git a/app/views/info_request_batch/show.html.erb b/app/views/info_request_batch/show.html.erb
@@ -1,8 +1,7 @@
 <% @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] } %>
+  <%= render :partial => 'batch_sent' } %>
 <% end %>
 
 <div class="info_request_batch_intro">

diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
@@ -2569,12 +2569,6 @@ def make_request
                     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
 
             context "when the user is banned" do