From 927f034c10338f3b559f668a7665edb48622719d Mon Sep 17 00:00:00 2001 From: "vit.jonas@gmail.com" Date: Thu, 16 Jun 2011 08:23:44 +0000 Subject: [PATCH] * finished Issue 26: Auditing access to file revisions git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@161 5e329b0b-a2ee-ea63-e329-299493fc886d --- app/models/dmsf_file_revision.rb | 9 +++++++++ app/views/dmsf_files/_revision_access.html.erb | 16 ++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb index 2c2ce8a1..f0dacf89 100644 --- a/app/models/dmsf_file_revision.rb +++ b/app/models/dmsf_file_revision.rb @@ -84,6 +84,15 @@ class DmsfFileRevision < ActiveRecord::Base end end + def self.access_grouped(revision_id) + sql = "select user_id, count(*), min(created_at), max(created_at) from #{DmsfFileRevisionAccess.table_name} where dmsf_file_revision_id = ? group by user_id" + self.connection.execute(self.sanitize_sql_array([sql, revision_id])) + end + + def access_grouped + DmsfFileRevision.access_grouped(self.id) + end + def version "#{self.major_version}.#{self.minor_version}" end diff --git a/app/views/dmsf_files/_revision_access.html.erb b/app/views/dmsf_files/_revision_access.html.erb index 5a7f8e19..610a04a5 100644 --- a/app/views/dmsf_files/_revision_access.html.erb +++ b/app/views/dmsf_files/_revision_access.html.erb @@ -9,18 +9,14 @@ +<% @revision.access_grouped.each do |access| %> - Row 1 Data 1 - Row 1 Data 2 - qqq - www - - - Row 2 Data 1 - Row 2 Data 2 - aaa - sss + <%=h(User.find(access[0]))%> + <%=access[1]%> + <%=Time.parse(access[2]).to_s(:db)%> + <%=Time.parse(access[3]).to_s(:db)%> +<% end %>