jro_apps/redmine Commit - r3077:77aeca5d555b

Fixes 'follows' relation validation....

Jean-Philippe Lang -

r3077:77aeca5d555b

parent child

Context file:

r3077:77aeca5d555b

Collapse all files

app/models/issue_relation.rb +3 -3

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class IssueRelation < ActiveRecord::Base
               belongs_to :issue_from, :class_name => 'Issue', :foreign_key => 'issue_from_id'
               belongs_to :issue_to, :class_name => 'Issue', :foreign_key => 'issue_to_id'
               TYPE_RELATES      = "relates"
               TYPE_DUPLICATES   = "duplicates"
               TYPE_BLOCKS       = "blocks"
               TYPE_PRECEDES     = "precedes"
               TYPE_FOLLOWS      = "follows"
               TYPES = { TYPE_RELATES =>     { :name => :label_relates_to, :sym_name => :label_relates_to, :order => 1 },
                         TYPE_DUPLICATES =>  { :name => :label_duplicates, :sym_name => :label_duplicated_by, :order => 2 },
                         TYPE_BLOCKS =>      { :name => :label_blocks, :sym_name => :label_blocked_by, :order => 3 },
                         TYPE_PRECEDES =>    { :name => :label_precedes, :sym_name => :label_follows, :order => 4 },
                         TYPE_FOLLOWS =>     { :name => :label_follows, :sym_name => :label_precedes, :order => 5 }
                       }.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
                   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
               def other_issue(issue)
                 (self.issue_from_id == issue.id) ? issue_to : issue_from
               end
               def label_for(issue)
                 TYPES[relation_type] ? TYPES[relation_type][(self.issue_from_id == issue.id) ? :name : :sym_name] : :unknow
               end
               def before_save
+                reverse_if_needed
                 if TYPE_PRECEDES == relation_type
                   self.delay ||= 0
                 else
                   self.delay = nil
                 end
                 set_issue_to_dates
               end
               def set_issue_to_dates
                 soonest_start = self.successor_soonest_start
                 if soonest_start && (!issue_to.start_date || issue_to.start_date < soonest_start)
                   issue_to.start_date, issue_to.due_date = successor_soonest_start, successor_soonest_start + issue_to.duration
                   issue_to.save
                 end
               end
               def successor_soonest_start
                 return nil unless (TYPE_PRECEDES == self.relation_type) && (issue_from.start_date || issue_from.due_date)
                 (issue_from.due_date || issue_from.start_date) + 1 + delay
               end
               def <=>(relation)
                 TYPES[self.relation_type][:order] <=> TYPES[relation.relation_type][:order]
               end
               private
               def reverse_if_needed
                 if (TYPE_FOLLOWS == relation_type)
                   issue_tmp = issue_to
                   self.issue_to = issue_from
                   self.issue_from = issue_tmp
                   self.relation_type = TYPE_PRECEDES
                 end
               end
             end

test/unit/issue_relation_test.rb +11 0

             # Redmine - project management software
             # Copyright (C) 2006-2009  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             class IssueRelationTest < ActiveSupport::TestCase
               fixtures :issue_relations, :issues
               def test_create
                 from = Issue.find(1)
                 to = Issue.find(2)
                 relation = IssueRelation.new :issue_from => from, :issue_to => to, :relation_type => IssueRelation::TYPE_PRECEDES
                 assert relation.save
                 relation.reload
                 assert_equal IssueRelation::TYPE_PRECEDES, relation.relation_type
                 assert_equal from, relation.issue_from
                 assert_equal to, relation.issue_to
               end
               def test_follows_relation_should_be_reversed
                 from = Issue.find(1)
                 to = Issue.find(2)
                 relation = IssueRelation.new :issue_from => from, :issue_to => to, :relation_type => IssueRelation::TYPE_FOLLOWS
                 assert relation.save
                 relation.reload
                 assert_equal IssueRelation::TYPE_PRECEDES, relation.relation_type
                 assert_equal to, relation.issue_from
                 assert_equal from, relation.issue_to
               end
+              def test_follows_relation_should_not_be_reversed_if_validation_fails
+                from = Issue.find(1)
+                to = Issue.find(2)
+                relation = IssueRelation.new :issue_from => from, :issue_to => to, :relation_type => IssueRelation::TYPE_FOLLOWS, :delay => 'xx'
+                assert !relation.save
+                assert_equal IssueRelation::TYPE_FOLLOWS, relation.relation_type
+                assert_equal from, relation.issue_from
+                assert_equal to, relation.issue_to
+              end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages