comparison app/models/.svn/text-base/issue_relation.rb.svn-base @ 119:8661b858af72

* Update to Redmine trunk rev 4705
author Chris Cannam
date Thu, 13 Jan 2011 14:12:06 +0000
parents 513646585e45
children 0c939c159af4
comparison
equal deleted inserted replaced
39:150ceac17a8d 119:8661b858af72
82 set_issue_to_dates 82 set_issue_to_dates
83 end 83 end
84 84
85 def set_issue_to_dates 85 def set_issue_to_dates
86 soonest_start = self.successor_soonest_start 86 soonest_start = self.successor_soonest_start
87 if soonest_start 87 if soonest_start && issue_to
88 issue_to.reschedule_after(soonest_start) 88 issue_to.reschedule_after(soonest_start)
89 end 89 end
90 end 90 end
91 91
92 def successor_soonest_start 92 def successor_soonest_start
93 return nil unless (TYPE_PRECEDES == self.relation_type) && (issue_from.start_date || issue_from.due_date) 93 if (TYPE_PRECEDES == self.relation_type) && delay && issue_from && (issue_from.start_date || issue_from.due_date)
94 (issue_from.due_date || issue_from.start_date) + 1 + delay 94 (issue_from.due_date || issue_from.start_date) + 1 + delay
95 end
95 end 96 end
96 97
97 def <=>(relation) 98 def <=>(relation)
98 TYPES[self.relation_type][:order] <=> TYPES[relation.relation_type][:order] 99 TYPES[self.relation_type][:order] <=> TYPES[relation.relation_type][:order]
99 end 100 end