4 files changed, 36 insertions, 30 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index 01fbbf4eb..58b180db4 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -24,7 +24,7 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: public_body.rb,v 1.127 2009-01-26 12:12:17 francis Exp $
+# $Id: public_body.rb,v 1.128 2009-01-29 11:48:46 francis Exp $
 
 require 'csv'
 require 'set'
@@ -40,6 +40,7 @@ class PublicBody < ActiveRecord::Base
     
     has_many :info_requests, :order => 'created_at desc'
     has_many :public_body_tags
+    has_many :track_things, :order => 'created_at desc'
 
     def self.categories_with_headings
         [
diff --git a/app/views/admin_public_body/show.rhtml b/app/views/admin_public_body/show.rhtml
index 4d7c26a38..1e8f2c4e0 100644
--- a/app/views/admin_public_body/show.rhtml
+++ b/app/views/admin_public_body/show.rhtml
@@ -50,3 +50,7 @@
 <h2>Requests</h2>
 <%= render :partial => 'admin_request/some_requests', :locals => { :info_requests => @public_body.info_requests } %>
 
+<h2>Track things</h2>
+<%= render :partial => 'admin_track/some_tracks', :locals => { :track_things => @public_body.track_things } %>
+
+
diff --git a/app/views/admin_track/_some_tracks.rhtml b/app/views/admin_track/_some_tracks.rhtml
new file mode 100644
index 000000000..27bac8939
--- /dev/null
+++ b/app/views/admin_track/_some_tracks.rhtml
@@ -0,0 +1,29 @@
+<table>
+  <tr>
+  <th>Id</th>
+  <% for column in TrackThing.content_columns %>
+    <th><%= column.human_name %></th>
+  <% end %>
+  <th>Items sent by email</th>
+  <th>Actions</th>
+  </tr>
+  
+<% for track_thing in track_things %>
+  <tr class="<%= cycle('odd', 'even') %>">
+  <td><%=h track_thing.id %></td>
+  <% for column in TrackThing.content_columns.map { |c| c.name } %>
+    <td><%=h track_thing.send(column) %></td>
+  <% end %>
+  <td><%= track_thing.track_things_sent_emails.size %></td>
+  <td>
+      <% form_tag '../../user/destroy_track' do %>
+          <div>
+              <%= hidden_field_tag 'track_id', track_thing.id %>
+              <%= submit_tag "Destroy track" %>
+          </div>
+      <% end %>
+  </td>
+  </tr>
+<% end %>
+</table>
+
diff --git a/app/views/admin_user/show.rhtml b/app/views/admin_user/show.rhtml
index 699c75ca0..22db3f5d6 100644
--- a/app/views/admin_user/show.rhtml
+++ b/app/views/admin_user/show.rhtml
@@ -22,35 +22,7 @@
 </p>
 
 <h2>Track things</h2>
-
-<table>
-  <tr>
-  <th>Id</th>
-  <% for column in TrackThing.content_columns %>
-    <th><%= column.human_name %></th>
-  <% end %>
-  <th>Items sent by email</th>
-  <th>Actions</th>
-  </tr>
-  
-<% for track_thing in @admin_user.track_things.find(:all, :order => 'created_at desc') %>
-  <tr class="<%= cycle('odd', 'even') %>">
-  <td><%=h track_thing.id %></td>
-  <% for column in TrackThing.content_columns.map { |c| c.name } %>
-    <td><%=h track_thing.send(column) %></td>
-  <% end %>
-  <td><%= track_thing.track_things_sent_emails.size %></td>
-  <td>
-      <% form_tag '../destroy_track' do %>
-          <div>
-              <%= hidden_field_tag 'track_id', track_thing.id %>
-              <%= submit_tag "Destroy track" %>
-          </div>
-      <% end %>
-  </td>
-  </tr>
-<% end %>
-</table>
+<%= render :partial => 'admin_track/some_tracks', :locals => { :track_things => @admin_user.track_things } %>
 
 <h2>Post redirects</h2>