jro_apps/redmine Commit - r2122:b21b6c365cc1

Fixed: default category ignored when adding a document (#2328)....

Jean-Philippe Lang -

r2122:b21b6c365cc1

parent child

Context file:

r2122:b21b6c365cc1

Collapse all files

test/unit/document_test.rb created 644 +37 0

			@@ -0,0 +1,37
		1	# Redmine - project management software
		2	# Copyright (C) 2006-2008 Jean-Philippe Lang
		3	#
		4	# This program is free software; you can redistribute it and/or
		5	# modify it under the terms of the GNU General Public License
		6	# as published by the Free Software Foundation; either version 2
		7	# of the License, or (at your option) any later version.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License
		15	# along with this program; if not, write to the Free Software
		16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		17
		18	require File.dirname(__FILE__) + '/../test_helper'
		19
		20	class DocumentTest < Test::Unit::TestCase
		21	fixtures :projects, :enumerations, :documents
		22
		23	def test_create
		24	doc = Document.new(:project => Project.find(1), :title => 'New document', :category => Enumeration.find_by_name('User documentation'))
		25	assert doc.save
		26	end
		27
		28	def test_create_with_default_category
		29	# Sets a default category
		30	e = Enumeration.find_by_name('Technical documentation')
		31	e.update_attributes(:is_default => true)
		32
		33	doc = Document.new(:project => Project.find(1), :title => 'New document')
		34	assert_equal e, doc.category
		35	assert doc.save
		36	end
		37	end

app/controllers/documents_controller.rb +1 0

              # 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
                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 }
                  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)
                    Mailer.deliver_document_added(@document) if Setting.notified_events.include?('document_added')
                    redirect_to :action => 'index', :project_id => @project
                  end
                end
                def edit
                  @categories = Enumeration::get_values('DCAT')
                  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 +6 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 => "Enumeration", :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 ||= Enumeration.default('DCAT')
+                 end
+               end
              end

test/functional/documents_controller_test.rb +9 0

              # 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.
              require File.dirname(__FILE__) + '/../test_helper'
              require 'documents_controller'
              # Re-raise errors caught by the controller.
              class DocumentsController; def rescue_action(e) raise e end; end
              class DocumentsControllerTest < Test::Unit::TestCase
                fixtures :projects, :users, :roles, :members, :enabled_modules, :documents, :enumerations
                def setup
                  @controller = DocumentsController.new
                  @request    = ActionController::TestRequest.new
                  @response   = ActionController::TestResponse.new
                  User.current = nil
                end
                def test_index
+                 # Sets a default category
+                 e = Enumeration.find_by_name('Technical documentation')
+                 e.update_attributes(:is_default => true)
                  get :index, :project_id => 'ecookbook'
                  assert_response :success
                  assert_template 'index'
                  assert_not_nil assigns(:grouped)
+                 # Default category selected in the new document form
+                 assert_tag :select, :attributes => {:name => 'document[category_id]'},
+                                     :child => {:tag => 'option', :attributes => {:selected => 'selected'},
+                                                                  :content => 'Technical documentation'}
                end
                def test_new_with_one_attachment
                  @request.session[:user_id] = 2
                  set_tmp_attachments_directory
                  post :new, :project_id => 'ecookbook',
                             :document => { :title => 'DocumentsControllerTest#test_post_new',
                                            :description => 'This is a new document',
                                            :category_id => 2},
                             :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
                  assert_redirected_to 'projects/ecookbook/documents'
                  document = Document.find_by_title('DocumentsControllerTest#test_post_new')
                  assert_not_nil document
                  assert_equal Enumeration.find(2), document.category
                  assert_equal 1, document.attachments.size
                  assert_equal 'testfile.txt', document.attachments.first.filename
                end
                def test_destroy
                  @request.session[:user_id] = 2
                  post :destroy, :id => 1
                  assert_redirected_to 'projects/ecookbook/documents'
                  assert_nil Document.find_by_id(1)
                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