jro_apps/redmine Commit - r2981:43fd27fd0ce4

Show last update datetime (last attachment added) on document list (#4232)....

Jean-Philippe Lang -

r2981:43fd27fd0ce4

parent child

Context file:

r2981:43fd27fd0ce4

app/controllers/documents_controller.rb +1 -1

                 documents = @project.documents.find :all, :include => [:attachments, :category]
                 case @sort_by
                 when 'date'
-                  @grouped = documents.group_by {|d| d.created_on.to_date }
+                  @grouped = documents.group_by {|d| d.updated_on.to_date }
                 when 'title'
                   @grouped = documents.group_by {|d| d.title.first.upcase}
                 when 'author'

app/models/document.rb +8 0

@@ -34,4 +34,12 class Document < ActiveRecord::Base
34	self.category \|\|= DocumentCategory.default	34	self.category \|\|= DocumentCategory.default
35	end	35	end
36	end	36	end
		37
		38	def updated_on
		39	unless @updated_on
		40	a = attachments.find(:first, :order => 'created_on DESC')
		41	@updated_on = (a && a.created_on) \|\| created_on
		42	end
		43	@updated_on
		44	end
37	end	45	end

app/views/documents/_document.rhtml +1 -1

             <p><%= link_to h(document.title), :controller => 'documents', :action => 'show', :id => document %><br />
             <% unless document.description.blank? %><%=h(truncate(document.description, :length => 250)) %><br /><% end %>
-            <em><%= format_time(document.created_on) %></em></p>
  No newline at end of file
+            <em><%= format_time(document.updated_on) %></em></p>
  No newline at end of file

test/fixtures/attachments.yml +13 -1

               filename: error281.txt
               author_id: 2
             attachments_002:
-              created_on: 2006-07-19 21:07:27 +02:00
+              created_on: 2007-01-27 15:08:27 +01:00
               downloads: 0
               content_type: text/plain
               disk_filename: 060719210727_document.txt
               filename: picture.jpg
               author_id: 2
               content_type: image/jpeg
+            attachments_011:
+              created_on: 2007-02-12 15:08:27 +01:00
+              container_type: Document
+              container_id: 1
+              downloads: 0
+              disk_filename: 060719210727_picture.jpg
+              digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
+              id: 11
+              filesize: 452
+              filename: picture.jpg
+              author_id: 2
+              content_type: image/jpeg
   No newline at end of file

test/fixtures/documents.yml +7 0

@@ -5,3 +5,10 documents_001:
5	id: 1	5	id: 1
6	description: "Document description"	6	description: "Document description"
7	category_id: 1	7	category_id: 1
		8	documents_002:
		9	created_on: 2007-02-12 15:08:27 +01:00
		10	project_id: 1
		11	title: "An other document"
		12	id: 2
		13	description: ""
		14	category_id: 2 No newline at end of file

test/unit/document_test.rb +13 -1

             require File.dirname(__FILE__) + '/../test_helper'
             class DocumentTest < ActiveSupport::TestCase
-              fixtures :projects, :enumerations, :documents
+              fixtures :projects, :enumerations, :documents, :attachments
               def test_create
                 doc = Document.new(:project => Project.find(1), :title => 'New document', :category => Enumeration.find_by_name('User documentation'))
                 assert_equal e, doc.category
                 assert doc.save
               end
+              def test_updated_on_with_attachments
+                d = Document.find(1)
+                assert d.attachments.any?
+                assert_equal d.attachments.map(&:created_on).max, d.updated_on
+              end
+              def test_updated_on_without_attachments
+                d = Document.find(2)
+                assert d.attachments.empty?
+                assert_equal d.created_on, d.updated_on
+              end
             end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages