Use a partial to render request sent message

4 files changed, 35 insertions, 7 deletions

diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 39e7616ed..56ac396d8 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -123,7 +123,6 @@ class RequestController < ApplicationController
             @track_thing = TrackThing.create_track_for_request(@info_request)
             @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss], :has_json => true } ]
 
-
             respond_to do |format|
                 format.html { @has_json = true; render :template => 'request/show'}
                 format.json { render :json => @info_request.json_for_api(true) }
@@ -379,12 +378,7 @@ class RequestController < ApplicationController
             )
         end
 
-        flash[:notice] = _("<p>Your {{law_used_full}} request has been <strong>sent on its way</strong>!</p>
-            <p><strong>We will email you</strong> when there is a response, or after {{late_number_of_days}} working days if the authority still hasn't
-            replied by then.</p>
-            <p>If you write about this request (for example in a forum or a blog) please link to this page, and add an
-            annotation below telling people about your writing.</p>",:law_used_full=>@info_request.law_used_full,
-            :late_number_of_days => AlaveteliConfiguration::reply_late_after_days)
+        flash[:request_sent] = true
         redirect_to show_new_request_path(:url_title => @info_request.url_title)
     end
 
diff --git a/app/views/request/_request_sent.html.erb b/app/views/request/_request_sent.html.erb
new file mode 100644
index 000000000..5ce6f5317
--- /dev/null
+++ b/app/views/request/_request_sent.html.erb
@@ -0,0 +1,19 @@
+<div id="notice">
+  <p>
+    <%= _("Your {{law_used_full}} request has been <strong>sent on its way</strong>!",
+          :law_used_full => @info_request.law_used_full) %>
+  </p>
+
+  <p>
+    <%= _("<strong>We will email you</strong> when there is a response, or after " \
+          "{{late_number_of_days}} working days if the authority still hasn't " \
+          "replied by then.",
+          :late_number_of_days => AlaveteliConfiguration.reply_late_after_days) %>
+  </p>
+
+  <p>
+    <%= _("If you write about this request (for example in a forum or a blog) " \
+          "please link to this page, and add an annotation below telling people " \
+          "about your writing.") %>
+  </p>
+</div>
diff --git a/app/views/request/show.html.erb b/app/views/request/show.html.erb
index 1383030cd..3fb66c773 100644
--- a/app/views/request/show.html.erb
+++ b/app/views/request/show.html.erb
@@ -2,6 +2,11 @@
                 :title => h(@info_request.title),
                 :public_body => (@info_request.public_body.name)) %>
 
+<% if flash[:request_sent] %>
+  <%= render :partial => 'request_sent',
+             :locals => { :info_request => @info_request } %>
+<% end %>
+
 <% if @info_request.prominence == 'hidden' %>
     <p id="hidden_request">
     <%= _('This request has prominence \'hidden\'. You can only see it because you are logged
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index 2d3ccfa63..dc28f6dab 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -1073,6 +1073,16 @@ describe RequestController, "when creating a new request" do
         response.redirect_url.should =~ /request\/why_is_your_quango_called_gerald\/new$/
     end
 
+    it "sets the request_sent flash to true if successful" do
+        session[:user_id] = @user.id
+        post :new, :info_request => { :public_body_id => @body.id,
+            :title => "Why is your quango called Geraldine?", :tag_string => "" },
+            :outgoing_message => { :body => "This is a silly letter. It is too short to be interesting." },
+            :submitted_new_request => 1, :preview => 0
+
+        expect(flash[:request_sent]).to be_true
+    end
+
     it "should give an error if the same request is submitted twice" do
         session[:user_id] = @user.id