From 5bf647f290409182917f453be2ca7d13c526a7f1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 28 Feb 2013 17:47:58 +0000 Subject: [PATCH] Don't reload the issue in after_save callback. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11495 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue.rb | 3 --- test/functional/gantts_controller_test.rb | 4 ++-- test/unit/issue_test.rb | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 4b95cc011..6d3374a66 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -1174,7 +1174,6 @@ class Issue < ActiveRecord::Base if @parent_issue move_to_child_of(@parent_issue) end - reload elsif parent_issue_id != parent_id former_parent_id = parent_id # moving an existing issue @@ -1185,7 +1184,6 @@ class Issue < ActiveRecord::Base # to another tree unless root? move_to_right_of(root) - reload end old_root_id = root_id self.root_id = (@parent_issue.nil? ? id : @parent_issue.root_id ) @@ -1199,7 +1197,6 @@ class Issue < ActiveRecord::Base move_to_child_of(@parent_issue) end end - reload # delete invalid relations of all descendants self_and_descendants.each do |issue| issue.relations.each do |relation| diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb index 858340448..5beb9aa28 100644 --- a/test/functional/gantts_controller_test.rb +++ b/test/functional/gantts_controller_test.rb @@ -82,8 +82,8 @@ class GanttsControllerTest < ActionController::TestCase def test_gantt_should_display_relations IssueRelation.delete_all - issue1 = Issue.generate!(:start_date => 1.day.from_now, :due_date => 3.day.from_now) - issue2 = Issue.generate!(:start_date => 1.day.from_now, :due_date => 3.day.from_now) + issue1 = Issue.generate!(:start_date => 1.day.from_now.to_date, :due_date => 3.day.from_now.to_date) + issue2 = Issue.generate!(:start_date => 1.day.from_now.to_date, :due_date => 3.day.from_now.to_date) IssueRelation.create!(:issue_from => issue1, :issue_to => issue2, :relation_type => 'precedes') get :show diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index 8f77140d3..fec1ad378 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -1411,6 +1411,7 @@ class IssueTest < ActiveSupport::TestCase :relation_type => IssueRelation::TYPE_PRECEDES) assert_equal Date.parse('2012-10-18'), issue2.reload.start_date + issue1.reload issue1.due_date = '2012-10-23' issue1.save! issue2.reload @@ -1425,6 +1426,7 @@ class IssueTest < ActiveSupport::TestCase :relation_type => IssueRelation::TYPE_PRECEDES) assert_equal Date.parse('2012-10-18'), issue2.reload.start_date + issue1.reload issue1.start_date = '2012-09-17' issue1.due_date = '2012-09-18' issue1.save! @@ -1443,6 +1445,7 @@ class IssueTest < ActiveSupport::TestCase :relation_type => IssueRelation::TYPE_PRECEDES) assert_equal Date.parse('2012-10-18'), issue2.reload.start_date + issue1.reload issue1.start_date = '2012-09-17' issue1.due_date = '2012-09-18' issue1.save! -- 2.39.5