jro_apps/redmine Commit - r4468:ad620607539c

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

Jean-Philippe Lang -

r4468:ad620607539c

parent child

Context file:

r4468:ad620607539c

Collapse all files

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

                        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

test/unit/lib/redmine/helpers/gantt_test.rb +5 -5

                    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
                        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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages