aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2015-05-14 15:26:55 +0100
committerGareth Rees <gareth@mysociety.org>2015-06-04 13:51:17 +0100
commit2967cc3dd7b19b3e74cea7a20b15f5234fc070ec (patch)
tree911286e136852f2bc1900fced1272fd419f443f9
parent327547010d935dea887a1df3faa600ac0807c830 (diff)
Pass existing track to _tracking_links
The existing track is already found in PublicBodyController#show. Really, the partial shouldn't attempt to find one in the fallback case, but keeping for now for compatibility.
-rw-r--r--app/views/public_body/show.html.erb8
-rw-r--r--app/views/track/_tracking_links.html.erb4
2 files changed, 9 insertions, 3 deletions
diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb
index bd79449cf..546db681e 100644
--- a/app/views/public_body/show.html.erb
+++ b/app/views/public_body/show.html.erb
@@ -136,8 +136,14 @@
<% if @number_of_visible_requests > 4 %>
<%= render :partial => 'request/request_search_form' %>
<% end %>
+
<%= render :partial => 'more_info', :locals => { :public_body => @public_body } %>
- <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %>
+
+ <%= render :partial => 'track/tracking_links',
+ :locals => { :track_thing => @track_thing,
+ :existing_track => @existing_track,
+ :own_request => false,
+ :location => 'sidebar' } %>
</div>
</div>
diff --git a/app/views/track/_tracking_links.html.erb b/app/views/track/_tracking_links.html.erb
index c65f258bf..d94d3be13 100644
--- a/app/views/track/_tracking_links.html.erb
+++ b/app/views/track/_tracking_links.html.erb
@@ -1,6 +1,6 @@
<%
- if @user
- existing_track = TrackThing.find_existing(@user, track_thing)
+ existing_track = local_assigns.fetch(:existing_track) do
+ TrackThing.find_existing(@user, track_thing) if @user
end
%>