From 86d6f2fe372ee2725a6993e618d83f42d593f1e9 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Thu, 1 Sep 2011 00:43:42 +0000 Subject: [PATCH] Rails3: replace deprecated 'validate' method at IssueRelation model. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6937 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue_relation.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/issue_relation.rb b/app/models/issue_relation.rb index b4cb220bc..cc67b059e 100644 --- a/app/models/issue_relation.rb +++ b/app/models/issue_relation.rb @@ -41,6 +41,8 @@ class IssueRelation < ActiveRecord::Base validates_numericality_of :delay, :allow_nil => true validates_uniqueness_of :issue_to_id, :scope => :issue_from_id + validate :validate_issue_relation + attr_protected :issue_from_id, :issue_to_id def visible?(user=User.current) @@ -61,7 +63,7 @@ class IssueRelation < ActiveRecord::Base end end - def validate + def validate_issue_relation if issue_from && issue_to errors.add :issue_to_id, :invalid if issue_from_id == issue_to_id errors.add :issue_to_id, :not_same_project unless issue_from.project_id == issue_to.project_id || Setting.cross_project_issue_relations? -- 2.39.5