Commit 7017d9a9 authored by maeda's avatar maeda

Reverted r17054 (#27663).

The change breaks test/functional/issue_relations_controller_test.rb.



git-svn-id: https://svn.redmine.org/redmine/trunk@17055 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 646b1d3c
......@@ -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
......
......@@ -65,20 +65,6 @@ class IssueRelationTest < ActiveSupport::TestCase
assert_equal from, relation.issue_to
end
def test_cannot_create_inverse_relates_relations
from = Issue.find(1)
to = Issue.find(2)
relation1 = IssueRelation.new :issue_from => from, :issue_to => to,
:relation_type => IssueRelation::TYPE_RELATES
assert relation1.save
relation2 = IssueRelation.new :issue_from => to, :issue_to => from,
:relation_type => IssueRelation::TYPE_RELATES
assert !relation2.save
assert_not_equal [], relation2.errors[:base]
end
def test_follows_relation_should_not_be_reversed_if_validation_fails
from = Issue.find(1)
to = Issue.find(2)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment