Reverted r17054 (#27663).

The change breaks test/functional/issue_relations_controller_test.rb.



git-svn-id: http://svn.redmine.org/redmine/trunk@17055 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 1 insertions, 9 deletions

diff --git a/app/models/issue_relation.rb b/app/models/issue_relation.rb
index 0a47b1341..44c7c8dba 100644
--- a/app/models/issue_relation.rb
+++ b/app/models/issue_relation.rb
@@ -207,19 +207,13 @@ class IssueRelation < ActiveRecord::Base
 
   # Reverses the relation if needed so that it gets stored in the proper way
   # Should not be reversed before validation so that it can be displayed back
-  # as entered on new relation form.
-  #
-  # Orders relates relations by ID, so that uniqueness index in DB is triggered
-  # on concurrent access.
+  # as entered on new relation form
   def reverse_if_needed
     if TYPES.has_key?(relation_type) && TYPES[relation_type][:reverse]
       issue_tmp = issue_to
       self.issue_to = issue_from
       self.issue_from = issue_tmp
       self.relation_type = TYPES[relation_type][:reverse]
-
-    elsif relation_type == TYPE_RELATES && issue_from_id > issue_to_id
-      self.issue_to, self.issue_from = issue_from, issue_to
     end
   end
 
@@ -234,8 +228,6 @@ class IssueRelation < ActiveRecord::Base
       issue_from.blocks? issue_to
     when 'blocks'
       issue_to.blocks? issue_from
-    when 'relates'
-      self.class.where(issue_from_id: issue_to, issue_to_id: issue_from).present?
     else
       false
     end