aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancis <francis>2007-09-05 11:17:38 +0000
committerfrancis <francis>2007-09-05 11:17:38 +0000
commitc6fae6ef88127f8463c7c328c6f96afd5bc1cb08 (patch)
tree26ca011bec9cc7bb22f8354b5bbbc1c9e34b48d4
parent4f73b2affce8b4c64ac0877d5683a3db33a45d36 (diff)
Display edit history of public bodies on their "show" page.
-rw-r--r--app/views/admin_public_body/_form.rhtml2
-rw-r--r--app/views/admin_public_body/show.rhtml29
-rw-r--r--todo.txt7
3 files changed, 28 insertions, 10 deletions
diff --git a/app/views/admin_public_body/_form.rhtml b/app/views/admin_public_body/_form.rhtml
index 44d4f2c05..0c2576bc3 100644
--- a/app/views/admin_public_body/_form.rhtml
+++ b/app/views/admin_public_body/_form.rhtml
@@ -12,7 +12,7 @@
<p><label for="public_body_complaint_email">Complaint email</label><br/>
<%= text_field 'public_body', 'complaint_email', :size => 40 %></p>
-<p><label for="public_body_last_edit_comment">Edit cOmment</label><br/>
+<p><label for="public_body_last_edit_comment">Edit comment</label><br/>
<%= text_area 'public_body', 'last_edit_comment', :rows => 3, :cols => 60 %></p>
<!--[eoform:public_body]-->
diff --git a/app/views/admin_public_body/show.rhtml b/app/views/admin_public_body/show.rhtml
index 4e1aa2ad3..21d7203c2 100644
--- a/app/views/admin_public_body/show.rhtml
+++ b/app/views/admin_public_body/show.rhtml
@@ -1,8 +1,33 @@
-<% for column in PublicBody.content_columns %>
+<h1><%=h @public_body.name%></h1>
+
<p>
+<% for column in PublicBody.content_columns %>
<b><%= column.human_name %>:</b> <%=h @public_body.send(column.name) %>
-</p>
+ <br/>
<% end %>
+</p>
<%= link_to 'Edit', :action => 'edit', :id => @public_body %> |
<%= link_to 'Back', :action => 'list' %>
+
+<h2>History</h2>
+<table border="1">
+<tr>
+<% for column in PublicBody.content_columns %>
+ <th><%= column.human_name %></th>
+<% end %>
+<th>Updated at</th>
+</tr>
+<% for old_public_body in @public_body.versions.reverse %>
+ <tr>
+ <% for column in PublicBody.content_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) %>
+ <td <%= changed ? ' style="font-weight: bold" ': '' %> >
+ <%=h old_public_body.send(column.name) %>
+ </td>
+ <% end %>
+ <td><%=h old_public_body.updated_at %></td>
+ </tr>
+<% end %>
+</table>
diff --git a/todo.txt b/todo.txt
index e93623ffa..c43d3f368 100644
--- a/todo.txt
+++ b/todo.txt
@@ -2,10 +2,3 @@
Fix up how we do HTML 4.0
-Public body
------------
-
-Display history of public body in admin
-
-
-