diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-21 11:04:50 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-21 11:04:50 +0000 |
| commit | fe28193e4eb9af2dc5262535a29ffde5249568fc (patch) | |
| tree | bd4cf3a9fbada98e58e510ca0e25c42bf00676a7 /app/models/issue_relation.rb | |
| parent | 9a986ac0a51fe844eee816325e6a6d4122136d9a (diff) | |
| download | redmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.tar.gz redmine-fe28193e4eb9af2dc5262535a29ffde5249568fc.zip | |
Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 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 13e14cccc..d26292c37 100644 --- a/app/models/issue_relation.rb +++ b/app/models/issue_relation.rb @@ -39,9 +39,9 @@ class IssueRelation < ActiveRecord::Base def validate if issue_from && issue_to - errors.add :issue_to_id, :activerecord_error_invalid if issue_from_id == issue_to_id - errors.add :issue_to_id, :activerecord_error_not_same_project unless issue_from.project_id == issue_to.project_id || Setting.cross_project_issue_relations? - errors.add_to_base :activerecord_error_circular_dependency if issue_to.all_dependent_issues.include? issue_from + 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? + errors.add_to_base :circular_dependency if issue_to.all_dependent_issues.include? issue_from end end |