2 files changed, 12 insertions, 11 deletions
diff --git a/app/views/admin_public_body/list.rhtml b/app/views/admin_public_body/list.rhtml
index 35fc755bd..f932c2236 100644
--- a/app/views/admin_public_body/list.rhtml
+++ b/app/views/admin_public_body/list.rhtml
@@ -9,12 +9,10 @@
   
 <% for public_body in @public_bodies %>
   <tr class="<%= cycle('odd', 'even') %>">
-  <% for column in PublicBody.content_columns %>
-    <td><%=h public_body.send(column.name) %></td>
+    <td><%= link_to public_body.name, :action => 'show', :id => public_body %></td>
+  <% for column in PublicBody.content_columns.map { |c| c.name } - [ "name" ] %>
+    <td><%=h public_body.send(column) %></td>
   <% end %>
-    <td><%= link_to 'Show', :action => 'show', :id => public_body %></td>
-    <td><%= link_to 'Edit', :action => 'edit', :id => public_body %></td>
-    <td><%= link_to 'Destroy', { :action => 'destroy', :id => public_body }, :confirm => 'Are you sure?', :method => :post %></td>
   </tr>
 <% end %>
 </table>
diff --git a/app/views/admin_public_body/show.rhtml b/app/views/admin_public_body/show.rhtml
index dfe10b7f1..bc8abd890 100644
--- a/app/views/admin_public_body/show.rhtml
+++ b/app/views/admin_public_body/show.rhtml
@@ -13,21 +13,24 @@
 <h2>History</h2>
 <table border="1">
 <tr>
-<% for column in PublicBody.content_columns %>
+<% 
+    history_columns = PublicBody.content_columns
+    history_columns.delete_if {|c| ['created_at', 'updated_at'].include?(c.name)}
+    for column in history_columns %>
   <th><%= column.human_name %></th>
 <% end %>
 <th>Updated at</th>
 </tr>
-<% for old_public_body in @public_body.versions.reverse %>
+<% for historic_public_body in @public_body.versions.reverse %>
       <tr class="<%= cycle('odd', 'even') %>">
-    <% for column in PublicBody.content_columns %>
+    <% for column in history_columns %>
       <% # Highlight entries which have changed since previous version
-        changed = ((old_public_body.send(column.name) != @public_body.versions[old_public_body.version - 2].send(column.name)) && column.name != 'version' && column.name != 'last_edit_editor' && column.name != 'last_edit_comment') || (old_public_body.version == 1) %>
+        changed = (not ['version', 'last_edit_editor', 'last_edit_comment'].include?(column.name)) && ((historic_public_body.send(column.name) != @public_body.versions[historic_public_body.version - 2].send(column.name)) || (historic_public_body.version == 1)) %>
       <td <%= changed ? ' class="entry_changed" ': '' %> >
-      <%=h old_public_body.send(column.name) %>
+      <%=h historic_public_body.send(column.name) %>
       </td>
     <% end %>
-      <td><%=h old_public_body.updated_at %></td>
+      <td><%=h historic_public_body.updated_at %></td>
     </tr>
 <% end %>
 </table>