Make tracking links relative

3 files changed, 17 insertions, 11 deletions

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 87bec6bf0..1463096e8 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -164,24 +164,28 @@ module LinkToHelper
     end
 
     # Tracks. feed can be 'track' or 'feed'
-    def do_track_url(track_thing, feed = 'track')
+    def do_track_url(track_thing, feed = 'track', options = {})
         if track_thing.track_type == 'request_updates'
-            track_request_url(:url_title => track_thing.info_request.url_title, :feed => feed)
+            track_request_url(options.merge(:url_title => track_thing.info_request.url_title, :feed => feed))
         elsif track_thing.track_type == 'all_new_requests'
-            track_list_url(:view => 'recent', :feed => feed)
+            track_list_url(options.merge(:view => 'recent', :feed => feed))
         elsif track_thing.track_type == 'all_successful_requests'
-            track_list_url(:view => 'successful', :feed => feed)
+            track_list_url(options.merge(:view => 'successful', :feed => feed))
         elsif track_thing.track_type == 'public_body_updates'
-            track_public_body_url(:url_name => track_thing.public_body.url_name, :feed => feed)
+            track_public_body_url(options.merge(:url_name => track_thing.public_body.url_name, :feed => feed))
         elsif track_thing.track_type == 'user_updates'
-            track_user_url(:url_name => track_thing.tracked_user.url_name, :feed => feed)
+            track_user_url(options.merge(:url_name => track_thing.tracked_user.url_name, :feed => feed))
         elsif track_thing.track_type == 'search_query'
-            track_search_url(:query_array => track_thing.track_query, :feed => feed)
+            track_search_url(options.merge(:query_array => track_thing.track_query, :feed => feed))
         else
             raise "unknown tracking type " + track_thing.track_type
         end
     end
 
+    def do_track_path(track_thing, feed = 'track')
+        do_track_url(track_thing, feed, :only_path => true)
+    end
+
     # General pages.
     def search_url(query, params = nil)
         if query.kind_of?(Array)
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
diff --git a/app/views/track/_tracking_links.rhtml b/app/views/track/_tracking_links.rhtml
index 06e87ac74..d89c0e4a9 100644
--- a/app/views/track/_tracking_links.rhtml
+++ b/app/views/track/_tracking_links.rhtml
@@ -14,15 +14,15 @@
 <% elsif track_thing %>
     <div class="feed_link feed_link_<%=location%>">
      <% if defined? follower_count && follower_count > 0 %>
-        <%= link_to _("I like this request"), do_track_url(track_thing), :class => "link_button_green" %>
+        <%= link_to _("I like this request"), do_track_path(track_thing), :class => "link_button_green" %>
      <% else %>
-        <%= link_to _("Follow"), do_track_url(track_thing), :class => "link_button_green" %>
+        <%= link_to _("Follow"), do_track_path(track_thing), :class => "link_button_green" %>
      <% end %>
     </div>
 
     <div class="feed_link feed_link_<%=location%>">
-        <%= link_to '<img src="/images/feed-16.png" alt="">'.html_safe, do_track_url(track_thing, 'feed') %>
-        <%= link_to (location == 'sidebar' ? _('RSS feed of updates') : _('RSS feed')),  do_track_url(track_thing, 'feed') %>
+        <%= link_to '<img src="/images/feed-16.png" alt="">'.html_safe, do_track_path(track_thing, 'feed') %>
+        <%= link_to (location == 'sidebar' ? _('RSS feed of updates') : _('RSS feed')),  do_track_path(track_thing, 'feed') %>
     </div>
 <% end %>