kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Jean-Philippe Lang 2010-10-22 22:13:39 +00:00
parent b7e3f80e14
commit ed608cb7d3
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/redmine/helpers/gantt.rb
View File

@ -283,8 +283,8 @@ module Redmine
end end
def line_for_project(project, options) def line_for_project(project, options)
# Skip versions that don't have a start_date # Skip versions that don't have a start_date or due date
if project.is_a?(Project) && project.start_date if project.is_a?(Project) && project.start_date && project.due_date
options[:zoom] ||= 1 options[:zoom] ||= 1
options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom] options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
@ -419,7 +419,7 @@ module Redmine
def line_for_version(version, options) def line_for_version(version, options)
# Skip versions that don't have a start_date # 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[:zoom] ||= 1
options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom] options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]

12
test/functional/gantts_controller_test.rb
View File

@ -21,7 +21,7 @@ class GanttsControllerTest < ActionController::TestCase
assert_select "div a.issue", /##{i.id}/ assert_select "div a.issue", /##{i.id}/
end end
should_eventually "work without issue due dates" do should "work without issue due dates" do
Issue.update_all("due_date = NULL") Issue.update_all("due_date = NULL")
get :show, :project_id => 1 get :show, :project_id => 1
@ -29,6 +29,16 @@ class GanttsControllerTest < ActionController::TestCase
assert_template 'show.html.erb' assert_template 'show.html.erb'
assert_not_nil assigns(:gantt) assert_not_nil assigns(:gantt)
end 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 should "work cross project" do
get :show get :show