Fixed: error on gantt when no issue have a due date (#6350).

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

Fixed: error on gantt when no issue have a due date (#6350).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4280 e93f8b46-1217-0410-a6f0-8f06a7374b81
ed608cb7 · Jean-Philippe Lang · b7e3f80e · ed608cb7 · ed608cb7
Commit ed608cb7 authored Oct 22, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 4 deletions

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

gantts_controller_test.rb test/functional/gantts_controller_test.rb +11 -1

No files found.
--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -283,8 +283,8 @@ module Redmine
      end

      def line_for_project(project, options)
-        # Skip versions that don't have a start_date
-        if project.is_a?(Project) && project.start_date
+        # Skip versions that don't have a start_date or due date
+        if project.is_a?(Project) && project.start_date && project.due_date
          options[:zoom] ||= 1
          options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]

@@ -419,7 +419,7 @@ module Redmine

      def line_for_version(version, options)
        # Skip versions that don't have a start_date
-        if version.is_a?(Version) && version.start_date
+        if version.is_a?(Version) && version.start_date && version.due_date
          options[:zoom] ||= 1
          options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]


--- a/test/functional/gantts_controller_test.rb
+++ b/test/functional/gantts_controller_test.rb
@@ -21,7 +21,7 @@ class GanttsControllerTest < ActionController::TestCase
      assert_select "div a.issue", /##{i.id}/
    end
    
-    should_eventually "work without issue due dates" do
+    should "work without issue due dates" do
      Issue.update_all("due_date = NULL")
      
      get :show, :project_id => 1
@@ -29,6 +29,16 @@ class GanttsControllerTest < ActionController::TestCase
      assert_template 'show.html.erb'
      assert_not_nil assigns(:gantt)
    end
+    
+    should "work without issue and version due dates" do
+      Issue.update_all("due_date = NULL")
+      Version.update_all("effective_date = NULL")
+      
+      get :show, :project_id => 1
+      assert_response :success
+      assert_template 'show.html.erb'
+      assert_not_nil assigns(:gantt)
+    end

    should "work cross project" do
      get :show