kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed: selected modules are not activated when copying a project (#8244). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5581 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2011-04-29 07:26:45 +00:00
parent 02c5577a26
commit fab9aca747
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/projects_controller.rb
View File

@ -117,7 +117,6 @@ class ProjectsController < ApplicationController
Mailer.with_deliveries(params[:notifications] == '1') do Mailer.with_deliveries(params[:notifications] == '1') do
@project = Project.new @project = Project.new
@project.safe_attributes = params[:project] @project.safe_attributes = params[:project]
@project.enabled_module_names = params[:enabled_modules]
if validate_parent_id && @project.copy(@source_project, :only => params[:only]) if validate_parent_id && @project.copy(@source_project, :only => params[:only])
@project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
flash[:notice] = l(:notice_successful_create) flash[:notice] = l(:notice_successful_create)

11
test/functional/projects_controller_test.rb
View File

@ -448,7 +448,7 @@ class ProjectsControllerTest < ActionController::TestCase
end end
end end
def test_copy_with_project def test_get_copy
@request.session[:user_id] = 1 # admin @request.session[:user_id] = 1 # admin
get :copy, :id => 1 get :copy, :id => 1
assert_response :success assert_response :success
@ -456,9 +456,12 @@ class ProjectsControllerTest < ActionController::TestCase
assert assigns(:project) assert assigns(:project)
assert_equal Project.find(1).description, assigns(:project).description assert_equal Project.find(1).description, assigns(:project).description
assert_nil assigns(:project).id assert_nil assigns(:project).id
assert_tag :tag => 'input',
:attributes => {:name => 'project[enabled_module_names][]', :value => 'issue_tracking'}
end end
def test_copy_without_project def test_get_copy_without_project
@request.session[:user_id] = 1 # admin @request.session[:user_id] = 1 # admin
get :copy get :copy
assert_response :redirect assert_response :redirect
@ -475,12 +478,14 @@ class ProjectsControllerTest < ActionController::TestCase
:name => 'Copy', :name => 'Copy',
:identifier => 'unique-copy', :identifier => 'unique-copy',
:tracker_ids => ['1', '2', '3', ''], :tracker_ids => ['1', '2', '3', ''],
:enabled_modules => %w(issue_tracking time_tracking) :enabled_module_names => %w(issue_tracking time_tracking)
}, },
:only => %w(issues versions) :only => %w(issues versions)
end end
project = Project.find('unique-copy') project = Project.find('unique-copy')
source = Project.find(1) source = Project.find(1)
assert_equal %w(issue_tracking time_tracking), project.enabled_module_names.sort
assert_equal source.versions.count, project.versions.count, "All versions were not copied" assert_equal source.versions.count, project.versions.count, "All versions were not copied"
# issues assigned to a closed version won't be copied # issues assigned to a closed version won't be copied
assert_equal source.issues.select {|i| i.fixed_version.nil? || i.fixed_version.open?}.size, assert_equal source.issues.select {|i| i.fixed_version.nil? || i.fixed_version.open?}.size,