jro_apps/redmine Commit - r5145:8b39f62a4ce7

Modules selection lost on project form after validation failure (#8012)....

Jean-Philippe Lang -

r5145:8b39f62a4ce7

parent child

Context file:

r5145:8b39f62a4ce7

app/models/project.rb +1 -4

                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

test/functional/projects_controller_test.rb +16 0

                  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

test/unit/project_test.rb +8 0

                  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)

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