From 6c325ff7c1c14e8dbf767057252ea00a316d2c3f Mon Sep 17 00:00:00 2001
From: Daniel Munn <dan.munn@munnster.co.uk>
Date: Wed, 11 Jul 2012 10:07:12 +0200
Subject: [PATCH] Fixes #27 incorrect call to to_s causes execution error.

---
 app/models/dmsf_file.rb                        | 2 ++
 app/views/dmsf_files/_revision_access.html.erb | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index eebefcdb..36ee93bf 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -114,6 +114,8 @@ class DmsfFile < ActiveRecord::Base
       self.revisions.visible.each {|r| r.delete(true)}
       self.destroy
     else
+      #Revisions of a deleted file SHOULD be deleted too
+      self.revisions.visible.each {|r| r.delete }
       self.deleted = true
       self.deleted_by_user = User.current
       save
diff --git a/app/views/dmsf_files/_revision_access.html.erb b/app/views/dmsf_files/_revision_access.html.erb
index f2415b3b..2a443816 100644
--- a/app/views/dmsf_files/_revision_access.html.erb
+++ b/app/views/dmsf_files/_revision_access.html.erb
@@ -13,8 +13,8 @@
 			<tr>
 				<td><%=link_to_user(access.user)%></td>
 				<td><%=access["count"]%></td>
-				<td><%=access.min.to_s(:db)%></td>
-				<td><%=access.max.to_s(:db)%></td>
+				<td><%=access.min.to_s%></td>
+				<td><%=access.max.to_s%></td>
 			</tr>
 <% end %>
 		</tbody>