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

3 files changed, 10 insertions, 8 deletions

diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb
index 215b28e77..6f8d88a1a 100644
--- a/app/models/request_mailer.rb
+++ b/app/models/request_mailer.rb
@@ -71,8 +71,8 @@ class RequestMailer < ApplicationMailer
         @from = user.name_and_email
         @recipients = contact_from_name_and_email
         @subject = _("FOI response requires admin ({{reason}}) - {{title}}", :reason => info_request.described_state, :title => info_request.title)
-        url = main_url(request_url(info_request))
-        admin_url = request_admin_url(info_request)
+        url = request_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
 
@@ -80,7 +80,7 @@ class RequestMailer < ApplicationMailer
     def new_response(info_request, incoming_message)
         # Don't use login link here, just send actual URL. This is
         # because people tend to forward these emails amongst themselves.
-        url = main_url(incoming_message_url(incoming_message))
+        url = incoming_message_url(incoming_message)
 
         @from = contact_from_name_and_email
         headers 'Return-Path' => blackhole_email, 'Reply-To' => @from, # not much we can do if the user's email is broken
@@ -135,7 +135,7 @@ class RequestMailer < ApplicationMailer
         # Make a link going to the form to describe state, and which logs the
         # user in.
         post_redirect = PostRedirect.new(
-            :uri => main_url(request_url(info_request)) + "#describe_state_form_1",
+            :uri => request_url(info_request) + "#describe_state_form_1",
             :user_id => info_request.user.id)
         post_redirect.save!
         url = confirm_url(:email_token => post_redirect.email_token)
@@ -157,7 +157,7 @@ class RequestMailer < ApplicationMailer
                 'X-Auto-Response-Suppress' => 'OOF'
         @recipients = info_request.user.name_and_email
         @subject = _("Someone has updated the status of your request")
-        url = main_url(request_url(info_request))
+        url = request_url(info_request)
         @body = {:info_request => info_request, :url => url}
     end
 
@@ -189,7 +189,7 @@ class RequestMailer < ApplicationMailer
                 'X-Auto-Response-Suppress' => 'OOF'
         @recipients = info_request.user.name_and_email
         @subject = (_("Somebody added a note to your FOI request - ") + info_request.title).html_safe
-        @body = { :comment => comment, :info_request => info_request, :url => main_url(comment_url(comment)) }
+        @body = { :comment => comment, :info_request => info_request, :url => comment_url(comment) }
     end
     def comment_on_alert_plural(info_request, count, earliest_unalerted_comment)
         @from = contact_from_name_and_email
@@ -198,7 +198,7 @@ class RequestMailer < ApplicationMailer
                 'X-Auto-Response-Suppress' => 'OOF'
         @recipients = info_request.user.name_and_email
         @subject = (_("Some notes have been added to your FOI request - ") + info_request.title).html_safe
-        @body = { :count => count, :info_request => info_request, :url => main_url(comment_url(earliest_unalerted_comment)) }
+        @body = { :count => count, :info_request => info_request, :url => comment_url(earliest_unalerted_comment) }
     end
 
     # Class function, called by script/mailin with all incoming responses.
diff --git a/app/models/track_mailer.rb b/app/models/track_mailer.rb
index 7dfa87f52..51440e4d7 100644
--- a/app/models/track_mailer.rb
+++ b/app/models/track_mailer.rb
@@ -7,7 +7,7 @@
 class TrackMailer < ApplicationMailer
     def event_digest(user, email_about_things)
         post_redirect = PostRedirect.new(
-            :uri => main_url(user_url(user)) + "#email_subscriptions",
+            :uri => user_url(user) + "#email_subscriptions",
             :user_id => user.id)
         post_redirect.save!
         unsubscribe_url = confirm_url(:email_token => post_redirect.email_token)
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb
index dfe92b7fe..a0c74bdb6 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -23,6 +23,8 @@
 
 require 'set'
 
+# TODO: TrackThing looks like a good candidate for single table inheritance
+
 class TrackThing < ActiveRecord::Base
     belongs_to :tracking_user, :class_name => 'User'
     validates_presence_of :track_query