From 03ec1130f365722542376b4c104e3a7d05cf6fe9 Mon Sep 17 00:00:00 2001 From: "vit.jonas@gmail.com" Date: Sun, 19 Jun 2011 21:45:41 +0000 Subject: [PATCH] * fixed Issue 95: Error on file revision accesses with PostgreSQL as backend DB git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@176 5e329b0b-a2ee-ea63-e329-299493fc886d --- app/models/dmsf_file_revision.rb | 2 +- app/views/dmsf_files/_revision_access.html.erb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb index f0dacf89..4d01b5ec 100644 --- a/app/models/dmsf_file_revision.rb +++ b/app/models/dmsf_file_revision.rb @@ -85,7 +85,7 @@ class DmsfFileRevision < ActiveRecord::Base 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" + sql = "select user_id, count(*) as count, min(created_at) as min, max(created_at) as max from #{DmsfFileRevisionAccess.table_name} where dmsf_file_revision_id = ? group by user_id" self.connection.execute(self.sanitize_sql_array([sql, revision_id])) end diff --git a/app/views/dmsf_files/_revision_access.html.erb b/app/views/dmsf_files/_revision_access.html.erb index 60eab7ff..0b57786b 100644 --- a/app/views/dmsf_files/_revision_access.html.erb +++ b/app/views/dmsf_files/_revision_access.html.erb @@ -11,10 +11,10 @@ <% revision.access_grouped.each do |access| %> - <%=h(User.find(access[0]))%> - <%=access[1]%> - <%=Time.parse(access[2]).to_s(:db)%> - <%=Time.parse(access[3]).to_s(:db)%> + <%=h(User.find(access["user_id"]))%> + <%=access["count"]%> + <%=Time.parse(access["min"]).to_s(:db)%> + <%=Time.parse(access["max"]).to_s(:db)%> <% end %>