Inline helper

4 files changed, 19 insertions, 23 deletions

diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
index 51f5e0aff..afd71ebe7 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -52,7 +52,7 @@ class AdminRequestController < AdminController
         @outgoing_message = OutgoingMessage.find(params[:outgoing_message_id])
         @outgoing_message.resend_message
         flash[:notice] = "Outgoing message resent"
-        redirect_to request_admin_url(@outgoing_message.info_request)
+        redirect_to admin_request_show_url(@outgoing_message.info_request)
     end
 
     def edit
@@ -98,7 +98,7 @@ class AdminRequestController < AdminController
             # expire cached files
             expire_for_request(@info_request)
             flash[:notice] = 'Request successfully updated.'
-            redirect_to request_admin_url(@info_request)
+            redirect_to admin_request_show_url(@info_request)
         else
             render :action => 'edit'
         end
@@ -131,7 +131,7 @@ class AdminRequestController < AdminController
             { :editor => admin_current_user(), :deleted_outgoing_message_id => outgoing_message_id })
 
         flash[:notice] = 'Outgoing message successfully destroyed.'
-        redirect_to request_admin_url(@info_request)
+        redirect_to admin_request_show_url(@info_request)
     end
 
     def update_outgoing
@@ -144,7 +144,7 @@ class AdminRequestController < AdminController
                 { :outgoing_message_id => @outgoing_message.id, :editor => admin_current_user(),
                     :old_body => old_body, :body => @outgoing_message.body })
             flash[:notice] = 'Outgoing message successfully updated.'
-            redirect_to request_admin_url(@outgoing_message.info_request)
+            redirect_to admin_request_show_url(@outgoing_message.info_request)
         else
             render :action => 'edit_outgoing'
         end
@@ -168,7 +168,7 @@ class AdminRequestController < AdminController
                     :old_visible => old_visible, :visible => @comment.visible,
                 })
             flash[:notice] = 'Comment successfully updated.'
-            redirect_to request_admin_url(@comment.info_request)
+            redirect_to admin_request_show_url(@comment.info_request)
         else
             render :action => 'edit_comment'
         end
@@ -186,7 +186,7 @@ class AdminRequestController < AdminController
         # expire cached files
         expire_for_request(@info_request)
         flash[:notice] = 'Incoming message successfully destroyed.'
-        redirect_to request_admin_url(@info_request)
+        redirect_to admin_request_show_url(@info_request)
     end
 
     def redeliver_incoming
@@ -203,7 +203,7 @@ class AdminRequestController < AdminController
                 end
                 if destination_request.nil?
                     flash[:error] = "Failed to find destination request '" + m + "'"
-                    return redirect_to request_admin_url(previous_request)
+                    return redirect_to admin_request_show_url(previous_request)
                 end
 
                 raw_email_data = incoming_message.raw_email.data
@@ -223,7 +223,7 @@ class AdminRequestController < AdminController
             expire_for_request(previous_request)
             incoming_message.fully_destroy
         end
-        redirect_to request_admin_url(destination_request)
+        redirect_to admin_request_show_url(destination_request)
     end
 
     # change user or public body of a request magically
@@ -246,7 +246,7 @@ class AdminRequestController < AdminController
                 info_request.reindex_request_events
                 flash[:notice] = "Message has been moved to new user"
             end
-            redirect_to request_admin_url(info_request)
+            redirect_to admin_request_show_url(info_request)
         elsif params[:commit] == 'Move request to authority' && !params[:public_body_url_name].blank?
             old_public_body = info_request.public_body
             destination_public_body = PublicBody.find_by_url_name(params[:public_body_url_name])
@@ -265,10 +265,10 @@ class AdminRequestController < AdminController
                 flash[:notice] = "Request has been moved to new body"
             end
 
-            redirect_to request_admin_url(info_request)
+            redirect_to admin_request_show_url(info_request)
         else
             flash[:error] = "Please enter the user or authority to move the request to"
-            redirect_to request_admin_url(info_request)
+            redirect_to admin_request_show_url(info_request)
         end
     end
 
@@ -292,7 +292,7 @@ class AdminRequestController < AdminController
 
         if !info_request.public_body.is_foi_officer?(user)
             flash[:notice] = user.email + " is not an email at the domain @" + info_request.public_body.foi_officer_domain_required + ", so won't be able to upload."
-            redirect_to request_admin_url(info_request)
+            redirect_to admin_request_show_url(info_request)
             return
         end
 
@@ -305,7 +305,7 @@ class AdminRequestController < AdminController
         url = confirm_url(:email_token => post_redirect.email_token)
 
         flash[:notice] = 'Send "' + name + '" &lt;<a href="mailto:' + email + '">' + email + '</a>&gt; this URL: <a href="' + url + '">' + url + "</a> - it will log them in and let them upload a response to this request.".html_safe
-        redirect_to request_admin_url(info_request)
+        redirect_to admin_request_show_url(info_request)
     end
 
     def show_raw_email
@@ -355,7 +355,7 @@ class AdminRequestController < AdminController
         info_request_event.save!
 
         flash[:notice] = "Old response marked as having been a clarification"
-        redirect_to request_admin_url(info_request_event.info_request)
+        redirect_to admin_request_show_url(info_request_event.info_request)
     end
 
     def hide_request
@@ -387,7 +387,7 @@ class AdminRequestController < AdminController
             end
             # expire cached files
             expire_for_request(info_request)
-            redirect_to request_admin_url(info_request)
+            redirect_to admin_request_show_url(info_request)
         end
     end
 
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index bd59f24d0..2c4a30eda 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -22,16 +22,12 @@ module LinkToHelper
         link_to h(info_request.title), request_path(info_request), :class => cls
     end
 
-    def request_admin_url(info_request)
-        admin_request_show_url(info_request)
-    end
-
     def request_admin_link(info_request, name="admin", cls=nil)
-      link_to name, request_admin_url(info_request), :class => cls
+      link_to name, admin_request_show_url(info_request), :class => cls
     end
 
     def request_both_links(info_request)
-        link_to(h(info_request.title), request_url(info_request)) + " (" + link_to("admin", request_admin_url(info_request)) + ")"
+        link_to(h(info_request.title), request_url(info_request)) + " (" + link_to("admin", admin_request_show_url(info_request)) + ")"
     end
 
     def request_similar_url(info_request)
diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb
index 3be68ba24..de34ecf9f 100644
--- a/app/models/request_mailer.rb
+++ b/app/models/request_mailer.rb
@@ -68,7 +68,7 @@ class RequestMailer < ApplicationMailer
         @recipients = contact_from_name_and_email
         @subject = _("FOI response requires admin ({{reason}}) - {{title}}", :reason => info_request.described_state, :title => info_request.title)
         url = request_url(info_request)
-        admin_url = request_admin_url(info_request)
+        admin_url = admin_request_show_url(info_request)
         @body = {:reported_by => user, :info_request => info_request, :url => url, :admin_url => admin_url }
     end
 
diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index 0dc422cd8..b3dba4d4f 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -37,7 +37,7 @@
                     :user => @info_request.is_external? ? (@info_request.user_name || _('An anonymous user')) : user_link(@info_request.user),
                     :law_used_full => h(@info_request.law_used_full),
                     :user_admin_link => user_admin_link_for_request(@info_request, _('external'), _('admin')),
-                    :request_admin_url => request_admin_url(@info_request),
+                    :request_admin_url => admin_request_show_url(@info_request),
                     :public_body_link => public_body_link(@info_request.public_body),
                     :public_body_admin_url => public_body_admin_url(@info_request.public_body)) %>
         <% else %>