Merge remote-tracking branch 'openaustralia_github/make-links-relative' into develop

Conflicts:
    app/controllers/admin_request_controller.rb
    app/models/request_mailer.rb
    app/views/admin_general/index.rhtml
    app/views/admin_general/stats.rhtml
    app/views/admin_public_body/_one_list.rhtml
    app/views/admin_public_body/_tags.rhtml
    app/views/admin_public_body/show.rhtml
    app/views/admin_request/show.rhtml
    app/views/admin_user/show.rhtml
    app/views/layouts/admin.rhtml
    app/views/public_body/show.rhtml
    app/views/request/new.rhtml

1 files changed, 20 insertions, 20 deletions

diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
index 15d66aa0d..d84b44b6f 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -42,7 +42,7 @@ class AdminRequestController < AdminController
         vars = OpenStruct.new(:name_to => @info_request.user_name,
                 :name_from => Configuration::contact_name,
                 :info_request => @info_request, :reason => params[:reason],
-                :info_request_url => 'http://' + Configuration::domain + request_url(@info_request),
+                :info_request_url => 'http://' + Configuration::domain + request_path(@info_request),
                 :site_name => site_name)
         template = File.read(File.join(File.dirname(__FILE__), "..", "views", "admin_request", "hidden_user_explanation.rhtml"))
         @request_hidden_user_explanation = ERB.new(template).result(vars.instance_eval { binding })
@@ -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
@@ -114,7 +114,7 @@ class AdminRequestController < AdminController
         # expire cached files
         expire_for_request(@info_request)
         flash[:notice] = "Request #{url_title} has been completely destroyed. Email of user who made request: " + user.email
-        redirect_to admin_url('request/list')
+        redirect_to admin_request_list_url
     end
 
     def edit_outgoing
@@ -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,20 +292,20 @@ 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
 
         # Bejeeps, look, sometimes a URL is something that belongs in a controller, jesus.
-        # XXX hammer this square peg into the round MVC hole - should be calling main_url(upload_response_url())
+        # XXX hammer this square peg into the round MVC hole
         post_redirect = PostRedirect.new(
-            :uri => main_url(upload_response_url(:url_title => info_request.url_title, :only_path => true)),
+            :uri => upload_response_url(:url_title => info_request.url_title),
             :user_id => user.id)
         post_redirect.save!
-        url = main_url(confirm_url(:email_token => post_redirect.email_token, :only_path => true))
+        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