diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-12-18 20:59:30 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-12-18 20:59:30 +0000 |
commit | 77aeca5d555b87e37a4cf290e6f3fcf9ad5151e1 (patch) | |
tree | 568f2fbe76659b8044bb85dc3b57dbcdf60bebe8 /app/models/issue_relation.rb | |
parent | beb20e7c6e906b1b5c892841c1948cb50df86e3e (diff) | |
download | redmine-77aeca5d555b87e37a4cf290e6f3fcf9ad5151e1.tar.gz redmine-77aeca5d555b87e37a4cf290e6f3fcf9ad5151e1.zip |
Fixes 'follows' relation validation.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3191 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/issue_relation.rb')
-rw-r--r-- | app/models/issue_relation.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/issue_relation.rb b/app/models/issue_relation.rb index 2728d77aa..3706d05fa 100644 --- a/app/models/issue_relation.rb +++ b/app/models/issue_relation.rb @@ -33,14 +33,12 @@ class IssueRelation < ActiveRecord::Base }.freeze validates_presence_of :issue_from, :issue_to, :relation_type - validates_inclusion_of :relation_type, :in => [TYPE_RELATES, TYPE_DUPLICATES, TYPE_BLOCKS, TYPE_PRECEDES] + validates_inclusion_of :relation_type, :in => TYPES.keys validates_numericality_of :delay, :allow_nil => true validates_uniqueness_of :issue_to_id, :scope => :issue_from_id attr_protected :issue_from_id, :issue_to_id - before_validation :reverse_if_needed - def validate if issue_from && issue_to errors.add :issue_to_id, :invalid if issue_from_id == issue_to_id @@ -58,6 +56,8 @@ class IssueRelation < ActiveRecord::Base end def before_save + reverse_if_needed + if TYPE_PRECEDES == relation_type self.delay ||= 0 else |