git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5265 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/1.2.0
@@ -517,10 +517,7 @@ class Project < ActiveRecord::Base | |||
def enabled_module_names=(module_names) | |||
if module_names && module_names.is_a?(Array) | |||
module_names = module_names.collect(&:to_s).reject(&:blank?) | |||
# remove disabled modules | |||
enabled_modules.each {|mod| mod.destroy unless module_names.include?(mod.name)} | |||
# add new modules | |||
module_names.reject {|name| module_enabled?(name)}.each {|name| enabled_modules << EnabledModule.new(:name => name)} | |||
self.enabled_modules = module_names.collect {|name| enabled_modules.detect {|mod| mod.name == name} || EnabledModule.new(:name => name)} | |||
else | |||
enabled_modules.clear | |||
end |
@@ -288,6 +288,22 @@ class ProjectsControllerTest < ActionController::TestCase | |||
end | |||
end | |||
def test_create_should_preserve_modules_on_validation_failure | |||
with_settings :default_projects_modules => ['issue_tracking', 'repository'] do | |||
@request.session[:user_id] = 1 | |||
assert_no_difference 'Project.count' do | |||
post :create, :project => { | |||
:name => "blog", | |||
:identifier => "", | |||
:enabled_module_names => %w(issue_tracking news) | |||
} | |||
end | |||
assert_response :success | |||
project = assigns(:project) | |||
assert_equal %w(issue_tracking news), project.enabled_module_names.sort | |||
end | |||
end | |||
def test_create_should_not_accept_get | |||
@request.session[:user_id] = 1 | |||
get :create |
@@ -588,6 +588,14 @@ class ProjectTest < ActiveSupport::TestCase | |||
assert_nil Project.next_identifier | |||
end | |||
def test_enabled_module_names | |||
with_settings :default_projects_modules => ['issue_tracking', 'repository'] do | |||
project = Project.new | |||
project.enabled_module_names = %w(issue_tracking news) | |||
assert_equal %w(issue_tracking news), project.enabled_module_names.sort | |||
end | |||
end | |||
def test_enabled_module_names_should_not_recreate_enabled_modules | |||
project = Project.find(1) |