diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-03-08 07:44:54 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-03-08 07:44:54 +0000 |
| commit | 0f9ea965e75ea08b2e3a329b45b41a8c829a8ce8 (patch) | |
| tree | 9952a00df88556f07fa391f0ff47564e7fd28740 /app/models/issue_relation.rb | |
| parent | ea98d1897221361edac47d1dd30e4e29a7fdff3f (diff) | |
| download | redmine-0f9ea965e75ea08b2e3a329b45b41a8c829a8ce8.tar.gz redmine-0f9ea965e75ea08b2e3a329b45b41a8c829a8ce8.zip | |
Fix: Calculation of the start date of following issues ignores the "non-working days" setting (#14846).
Patch by Felix Schäfer.
git-svn-id: http://svn.redmine.org/redmine/trunk@17230 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/issue_relation.rb')
| -rw-r--r-- | app/models/issue_relation.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/issue_relation.rb b/app/models/issue_relation.rb index 0a47b1341..a4ad4163a 100644 --- a/app/models/issue_relation.rb +++ b/app/models/issue_relation.rb @@ -31,6 +31,7 @@ class IssueRelation < ActiveRecord::Base end include Redmine::SafeAttributes + include Redmine::Utils::DateCalculation belongs_to :issue_from, :class_name => 'Issue' belongs_to :issue_to, :class_name => 'Issue' @@ -189,7 +190,7 @@ class IssueRelation < ActiveRecord::Base def successor_soonest_start if (TYPE_PRECEDES == self.relation_type) && delay && issue_from && (issue_from.start_date || issue_from.due_date) - (issue_from.due_date || issue_from.start_date) + 1 + delay + add_working_days((issue_from.due_date || issue_from.start_date), (1 + delay)) end end |