Makes Version#start_date return the minimum start_date of its issues.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4574 e93f8b46-1217-0410-a6f0-8f06a7374b81

Makes Version#start_date return the minimum start_date of its issues.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4574 e93f8b46-1217-0410-a6f0-8f06a7374b81
df9ea241 · Jean-Philippe Lang · 07fe46e9 · df9ea241 · df9ea241 · df9ea241
Commit df9ea241 authored Dec 23, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

project.rb app/models/project.rb +1 -1

version.rb app/models/version.rb +2 -3

gantt.rb lib/redmine/helpers/gantt.rb +1 -1

No files found.
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -454,7 +454,7 @@ class Project < ActiveRecord::Base
    [
     issues.minimum('start_date'),
     shared_versions.collect(&:effective_date),
-     shared_versions.collect {|v| v.fixed_issues.minimum('start_date')}
+     shared_versions.collect(&:start_date)
    ].flatten.compact.min
  end


--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -43,7 +43,7 @@ class Version < ActiveRecord::Base
  end
  
  def start_date
-    effective_date
+    @start_date ||= fixed_issues.minimum('start_date')
  end
  
  def due_date
@@ -77,8 +77,7 @@ class Version < ActiveRecord::Base
  def behind_schedule?
    if completed_pourcent == 100
      return false
-    elsif due_date && fixed_issues.present? && fixed_issues.minimum('start_date') # TODO: should use #start_date but that method is wrong...
-      start_date = fixed_issues.minimum('start_date')
+    elsif due_date && start_date
      done_date = start_date + ((due_date - start_date+1)* completed_pourcent/100).floor
      return done_date <= Date.today
    else

--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -319,7 +319,7 @@ module Redmine
          options[:zoom] ||= 1
          options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
          
-          coords = coordinates(version.fixed_issues.minimum('start_date'), version.due_date, version.completed_pourcent, options[:zoom])
+          coords = coordinates(version.start_date, version.due_date, version.completed_pourcent, options[:zoom])
          label = "#{h version } #{h version.completed_pourcent.to_i.to_s}%"
          label = h("#{version.project} -") + label unless @project && @project == version.project