Redmine

I made the following patch with reference to the modification of #27663 .

diff --git a/app/models/issue_relation.rb b/app/models/issue_relation.rb
index d0a66ba40..e0075cb0a 100644
--- a/app/models/issue_relation.rb
+++ b/app/models/issue_relation.rb
@@ -239,6 +239,10 @@ class IssueRelation < ActiveRecord::Base
       issue_from.blocks? issue_to
     when 'blocks'
       issue_to.blocks? issue_from
+    when 'duplicated'
+      self.class.where(issue_from_id: issue_from, issue_to_id: issue_to, relation_type: TYPE_DUPLICATES).exists?
+    when 'duplicates'
+      self.class.where(issue_from_id: issue_to, issue_to_id: issue_from, relation_type: TYPE_DUPLICATES).exists?
     when 'relates'
       self.class.where(issue_from_id: issue_to, issue_to_id: issue_from).present?
     else

The registration data may contain Issues that you have already circular dependency. To solve this, add the following patch to fixed-34108.patch .

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 8c3146137..21aed394b 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1848,6 +1848,14 @@ class Issue < ActiveRecord::Base
   # Closes duplicates if the issue is being closed
   def close_duplicates
     if Setting.close_duplicate_issues? && closing?
+      # Check that there are no circular dependency of relationships
+      relations_to.where(:relation_type => IssueRelation::TYPE_DUPLICATES).each do |relation|
+        unless relation.valid?
+          errors.add :base, relation.errors.full_messages.first
+          throw :abort
+        end
+      end
+
       duplicates.each do |duplicate|
         # Reload is needed in case the duplicate was updated by a previous duplicate
         duplicate.reload

Go MAEDA wrote:

Thank you for writing the patch. But I found that fixed-34108-v2.patch does not cover the situation that 3 or more issues make circular dependency.

• Issue 101 ---(has duplicate)---> Issue 102
• Issue 102 ---(has duplicate)---> Issue 103
• Issue 103 ---(has duplicate)---> Issue 101

Thank you for pointing this out. I have fixed it to cover situations where three or more issues cause circular dependencies.

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 8ba261bb1f..a8810611cb 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1930,6 +1930,13 @@ class Issue < ActiveRecord::Base
   # Closes duplicates if the issue is being closed
   def close_duplicates
     if Setting.close_duplicate_issues? && closing?
+      # Check that there are no circular dependency of relationships
+      duplicate_issue_ids = circular_dependency_duplicate_issue_ids(duplicates)
+      if duplicate_issue_ids.include?(self.id)
+        self.errors.add :base, :circular_dependency
+        throw :abort
+      end
+
       duplicates.each do |duplicate|
         # Reload is needed in case the duplicate was updated by a previous duplicate
         duplicate.reload
@@ -1946,6 +1953,17 @@ class Issue < ActiveRecord::Base
     end
   end

+  def circular_dependency_duplicate_issue_ids(issues, duplicate_ids = [])
+    issues.each do |issue|
+      next if duplicate_ids.include?(issue.id)
+
+      duplicate_ids << issue.id
+      duplicate_ids.concat(circular_dependency_duplicate_issue_ids(issue.duplicates, duplicate_ids))
+      duplicate_ids.uniq!
+    end
+    duplicate_ids
+  end
+
   # Make sure updated_on is updated when adding a note and set updated_on now
   # so we can set closed_on with the same value on closing
   def force_updated_on_change