jro_apps/redmine Commit - r10662:f4cf7bc6f5dd

code layout cleanup app/models/issue_relation.rb...

Toshi MARUYAMA -

r10662:f4cf7bc6f5dd

parent child

Context file:

r10662:f4cf7bc6f5dd

Collapse all files

app/models/issue_relation.rb +33 -17

               TYPE_COPIED_TO    = "copied_to"
               TYPE_COPIED_FROM  = "copied_from"
-              TYPES = { TYPE_RELATES =>     { :name => :label_relates_to, :sym_name => :label_relates_to, :order => 1, :sym => TYPE_RELATES },
+              TYPES = {
-                        TYPE_DUPLICATES =>  { :name => :label_duplicates, :sym_name => :label_duplicated_by, :order => 2, :sym => TYPE_DUPLICATED },
+                TYPE_RELATES =>     { :name => :label_relates_to, :sym_name => :label_relates_to,
-                        TYPE_DUPLICATED =>  { :name => :label_duplicated_by, :sym_name => :label_duplicates, :order => 3, :sym => TYPE_DUPLICATES, :reverse => TYPE_DUPLICATES },
+                                      :order => 1, :sym => TYPE_RELATES },
-                        TYPE_BLOCKS =>      { :name => :label_blocks, :sym_name => :label_blocked_by, :order => 4, :sym => TYPE_BLOCKED },
+                TYPE_DUPLICATES =>  { :name => :label_duplicates, :sym_name => :label_duplicated_by,
-                        TYPE_BLOCKED =>     { :name => :label_blocked_by, :sym_name => :label_blocks, :order => 5, :sym => TYPE_BLOCKS, :reverse => TYPE_BLOCKS },
+                                      :order => 2, :sym => TYPE_DUPLICATED },
-                        TYPE_PRECEDES =>    { :name => :label_precedes, :sym_name => :label_follows, :order => 6, :sym => TYPE_FOLLOWS },
+                TYPE_DUPLICATED =>  { :name => :label_duplicated_by, :sym_name => :label_duplicates,
-                        TYPE_FOLLOWS =>     { :name => :label_follows, :sym_name => :label_precedes, :order => 7, :sym => TYPE_PRECEDES, :reverse => TYPE_PRECEDES },
+                                      :order => 3, :sym => TYPE_DUPLICATES, :reverse => TYPE_DUPLICATES },
-                        TYPE_COPIED_TO =>   { :name => :label_copied_to, :sym_name => :label_copied_from, :order => 8, :sym => TYPE_COPIED_FROM },
+                TYPE_BLOCKS =>      { :name => :label_blocks, :sym_name => :label_blocked_by,
-                        TYPE_COPIED_FROM => { :name => :label_copied_from, :sym_name => :label_copied_to, :order => 9, :sym => TYPE_COPIED_TO, :reverse => TYPE_COPIED_TO }
+                                      :order => 4, :sym => TYPE_BLOCKED },
-                      }.freeze
+                TYPE_BLOCKED =>     { :name => :label_blocked_by, :sym_name => :label_blocks,
+                                      :order => 5, :sym => TYPE_BLOCKS, :reverse => TYPE_BLOCKS },
+                TYPE_PRECEDES =>    { :name => :label_precedes, :sym_name => :label_follows,
+                                      :order => 6, :sym => TYPE_FOLLOWS },
+                TYPE_FOLLOWS =>     { :name => :label_follows, :sym_name => :label_precedes,
+                                      :order => 7, :sym => TYPE_PRECEDES, :reverse => TYPE_PRECEDES },
+                TYPE_COPIED_TO =>   { :name => :label_copied_to, :sym_name => :label_copied_from,
+                                      :order => 8, :sym => TYPE_COPIED_FROM },
+                TYPE_COPIED_FROM => { :name => :label_copied_from, :sym_name => :label_copied_to,
+                                      :order => 9, :sym => TYPE_COPIED_TO, :reverse => TYPE_COPIED_TO }
+              }.freeze
               validates_presence_of :issue_from, :issue_to, :relation_type
               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
               validate :validate_issue_relation
               attr_protected :issue_from_id, :issue_to_id
               before_save :handle_issue_order
               def visible?(user=User.current)
               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?
+                  unless issue_from.project_id == issue_to.project_id ||
-                  #detect circular dependencies depending wether the relation should be reversed
+                            Setting.cross_project_issue_relations?
+                    errors.add :issue_to_id, :not_same_project
+                  end
+                  # detect circular dependencies depending wether the relation should be reversed
                   if TYPES.has_key?(relation_type) && TYPES[relation_type][:reverse]
                     errors.add :base, :circular_dependency if issue_from.all_dependent_issues.include? issue_to
                   else
                     errors.add :base, :circular_dependency if issue_to.all_dependent_issues.include? issue_from
                   end
-                  errors.add :base, :cant_link_an_issue_with_a_descendant if issue_from.is_descendant_of?(issue_to) || issue_from.is_ancestor_of?(issue_to)
+                  if issue_from.is_descendant_of?(issue_to) || issue_from.is_ancestor_of?(issue_to)
+                    errors.add :base, :cant_link_an_issue_with_a_descendant
+                  end
                 end
               end
               end
               def label_for(issue)
-                TYPES[relation_type] ? TYPES[relation_type][(self.issue_from_id == issue.id) ? :name : :sym_name] : :unknow
+                TYPES[relation_type] ?
+                    TYPES[relation_type][(self.issue_from_id == issue.id) ? :name : :sym_name] :
+                    :unknow
               end
               def css_classes_for(issue)
               end
               def successor_soonest_start
-                if (TYPE_PRECEDES == self.relation_type) && delay && issue_from && (issue_from.start_date || issue_from.due_date)
+                if (TYPE_PRECEDES == self.relation_type) && delay && issue_from &&
+                       (issue_from.start_date || issue_from.due_date)
                   (issue_from.due_date || issue_from.start_date) + 1 + delay
                 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