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

Collapse all files

app/controllers/documents_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class DocumentsController < ApplicationController
               default_search_scope :documents
               before_filter :find_project, :only => [:index, :new]
               before_filter :find_document, :except => [:index, :new]
               before_filter :authorize
               helper :attachments
               def index
                 @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
                 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'
                   @grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author}
                 else
                   @grouped = documents.group_by(&:category)
                 end
                 @document = @project.documents.build
                 render :layout => false if request.xhr?
               end
               def show
                 @attachments = @document.attachments.find(:all, :order => "created_on DESC")
               end
               def new
                 @document = @project.documents.build(params[:document])
                 if request.post? and @document.save
                   attach_files(@document, params[:attachments])
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'index', :project_id => @project
                 end
               end
               def edit
                 @categories = DocumentCategory.all
                 if request.post? and @document.update_attributes(params[:document])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @document
                 end
               end
               def destroy
                 @document.destroy
                 redirect_to :controller => 'documents', :action => 'index', :project_id => @project
               end
               def add_attachment
                 attachments = attach_files(@document, params[:attachments])
                 Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('document_added')
                 redirect_to :action => 'show', :id => @document
               end
             private
               def find_project
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_document
                 @document = Document.find(params[:id])
                 @project = @document.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/models/document.rb +8 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Document < ActiveRecord::Base
               belongs_to :project
               belongs_to :category, :class_name => "DocumentCategory", :foreign_key => "category_id"
               acts_as_attachable :delete_permission => :manage_documents
               acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
               acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
                             :author => Proc.new {|o| (a = o.attachments.find(:first, :order => "#{Attachment.table_name}.created_on ASC")) ? a.author : nil },
                             :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
               acts_as_activity_provider :find_options => {:include => :project}
               validates_presence_of :project, :title, :category
               validates_length_of :title, :maximum => 60
               def after_initialize
                 if new_record?
                   self.category ||= DocumentCategory.default
                 end
               end
+              def updated_on
+                unless @updated_on
+                  a = attachments.find(:first, :order => 'created_on DESC')
+                  @updated_on = (a && a.created_on) || created_on
+                end
+                @updated_on
+              end
             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

             ---
             attachments_001:
               created_on: 2006-07-19 21:07:27 +02:00
               downloads: 0
               content_type: text/plain
               disk_filename: 060719210727_error281.txt
               container_id: 3
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 1
               container_type: Issue
               filesize: 28
               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
               container_id: 1
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 2
               container_type: Document
               filesize: 28
               filename: document.txt
               author_id: 2
             attachments_003:
               created_on: 2006-07-19 21:07:27 +02:00
               downloads: 0
               content_type: image/gif
               disk_filename: 060719210727_logo.gif
               container_id: 4
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 3
               container_type: WikiPage
               filesize: 280
               filename: logo.gif
               description: This is a logo
               author_id: 2
             attachments_004:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Issue
               container_id: 3
               downloads: 0
               disk_filename: 060719210727_source.rb
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 4
               filesize: 153
               filename: source.rb
               author_id: 2
               description: This is a Ruby source file
               content_type: application/x-ruby
             attachments_005:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Issue
               container_id: 3
               downloads: 0
               disk_filename: 060719210727_changeset.diff
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 5
               filesize: 687
               filename: changeset.diff
               author_id: 2
               content_type: text/x-diff
             attachments_006:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Issue
               container_id: 3
               downloads: 0
               disk_filename: 060719210727_archive.zip
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 6
               filesize: 157
               filename: archive.zip
               author_id: 2
               content_type: application/octet-stream
             attachments_007:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Issue
               container_id: 4
               downloads: 0
               disk_filename: 060719210727_archive.zip
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 7
               filesize: 157
               filename: archive.zip
               author_id: 1
               content_type: application/octet-stream
             attachments_008:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Project
               container_id: 1
               downloads: 0
               disk_filename: 060719210727_project_file.zip
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 8
               filesize: 320
               filename: project_file.zip
               author_id: 2
               content_type: application/octet-stream
             attachments_009:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Version
               container_id: 1
               downloads: 0
               disk_filename: 060719210727_version_file.zip
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 9
               filesize: 452
               filename: version_file.zip
               author_id: 2
               content_type: application/octet-stream
             attachments_010:
               created_on: 2006-07-19 21:07:27 +02:00
               container_type: Issue
               container_id: 2
               downloads: 0
               disk_filename: 060719210727_picture.jpg
               digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
               id: 10
               filesize: 452
               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

             documents_001:
               created_on: 2007-01-27 15:08:27 +01:00
               project_id: 1
               title: "Test document"
               id: 1
               description: "Document description"
               category_id: 1
+            documents_002:
+              created_on: 2007-02-12 15:08:27 +01:00
+              project_id: 1
+              title: "An other document"
+              id: 2
+              description: ""
+              category_id: 2
  No newline at end of file

test/unit/document_test.rb +13 -1

             # Redmine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             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 doc.save
               end
               def test_create_should_send_email_notification
                 ActionMailer::Base.deliveries.clear
                 Setting.notified_events << 'document_added'
                 doc = Document.new(:project => Project.find(1), :title => 'New document', :category => Enumeration.find_by_name('User documentation'))
                 assert doc.save
                 assert_equal 1, ActionMailer::Base.deliveries.size
               end
               def test_create_with_default_category
                 # Sets a default category
                 e = Enumeration.find_by_name('Technical documentation')
                 e.update_attributes(:is_default => true)
                 doc = Document.new(:project => Project.find(1), :title => 'New document')
                 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

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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