From: Go MAEDA Date: Tue, 11 Feb 2020 04:56:03 +0000 (+0000) Subject: Reverts r19510 that breaks IssueTest#test_closed_on_should_be_set_when_closing_an_ope... X-Git-Tag: 4.2.0~1202 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=39c979b3419c02967b6f68f9d99198fb64d9e30e;p=redmine.git Reverts r19510 that breaks IssueTest#test_closed_on_should_be_set_when_closing_an_open_issue (#5354). git-svn-id: http://svn.redmine.org/redmine/trunk@19511 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb b/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb index 3703a5e65..96fdbf8b6 100644 --- a/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb +++ b/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb @@ -145,9 +145,7 @@ module Redmine end end self.custom_values = target_custom_values - custom_values_changed = custom_values.any?(&:changed?) custom_values.each(&:save) - touch if persisted? && custom_values_changed @custom_field_values_changed = false true end diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index a49e609ce..6be670566 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -994,30 +994,6 @@ class ProjectsControllerTest < Redmine::ControllerTest assert_equal ['documents', 'issue_tracking', 'repository'], Project.find(1).enabled_module_names.sort end - def test_update_custom_field_should_update_updated_on - @request.session[:user_id] = 2 - project = Project.find(1) - project.update_attribute :updated_on, nil - assert_equal 'Stable', project.custom_value_for(3).value - - travel_to Time.current do - post( - :update, - :params => { - :id => 1, - :project => { - :custom_field_values => {'3' => 'Alpha'} - } - } - ) - assert_redirected_to '/projects/ecookbook/settings' - assert_equal 'Successful update.', flash[:notice] - project.reload - assert_equal 'Alpha', project.custom_value_for(3).value - assert_equal Time.current, project.updated_on - end - end - def test_destroy_leaf_project_without_confirmation_should_show_confirmation @request.session[:user_id] = 1 # admin