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

Disable project completion display on the gantt (#7127). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4582 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-12-29 20:29:42 +00:00
parent f2ae2e9239
commit ad62060753
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,8 +281,8 @@ module Redmine
options[:zoom] ||= 1
options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
coords = coordinates(project.start_date, project.due_date, project.completed_percent(:include_subprojects => true), options[:zoom])
label = "#{h project } #{h project.completed_percent(:include_subprojects => true).to_i.to_s}%"
coords = coordinates(project.start_date, project.due_date, nil, options[:zoom])
label = h(project)
case options[:format]
when :html

10
test/unit/lib/redmine/helpers/gantt_test.rb
View File

@ -353,24 +353,24 @@ class Redmine::Helpers::GanttTest < ActiveSupport::TestCase
end
context "late line" do
should "start from the starting point on the left" do
should_eventually "start from the starting point on the left" do
@response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
assert_select "div.project.task_late[style*=left:28px]", true, @response.body
end
should "be the total delayed width of the project" do
should_eventually "be the total delayed width of the project" do
@response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
assert_select "div.project.task_late[style*=width:30px]", true, @response.body
end
end
context "done line" do
should "start from the starting point on the left" do
should_eventually "start from the starting point on the left" do
@response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
assert_select "div.project.task_done[style*=left:28px]", true, @response.body
end
should "Be the total done width of the project" do
should_eventually "Be the total done width of the project" do
@response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
assert_select "div.project.task_done[style*=width:18px]", true, @response.body
end
@ -420,7 +420,7 @@ class Redmine::Helpers::GanttTest < ActiveSupport::TestCase
assert_select "div.project.label", /#{@project.name}/
end
should "show the percent complete" do
should_eventually "show the percent complete" do
@response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
assert_select "div.project.label", /0%/
end