diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-08-15 23:05:18 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-08-15 23:05:18 +0000 |
| commit | 565574e3be09d061f6e24fe03fda6fee78c5bed3 (patch) | |
| tree | 090d2b2042f293402cc7bce9b5a72aa14a54150d | |
| parent | ee1f94c7f293103d57357285be0e52a8eb915d47 (diff) | |
| download | redmine-565574e3be09d061f6e24fe03fda6fee78c5bed3.tar.gz redmine-565574e3be09d061f6e24fe03fda6fee78c5bed3.zip | |
Merged r19976 from trunk to 4.0-stable (#33175).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19981 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine/helpers/gantt.rb | 4 | ||||
| -rw-r--r-- | test/unit/lib/redmine/helpers/gantt_test.rb | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb index 92cc57c96..993f7f8c2 100644 --- a/lib/redmine/helpers/gantt.rb +++ b/lib/redmine/helpers/gantt.rb @@ -574,13 +574,13 @@ module Redmine zoom ||= @zoom coords = {} if start_date && end_date && start_date <= self.date_to && end_date >= self.date_from - if start_date > self.date_from + if start_date >= self.date_from coords[:start] = start_date - self.date_from coords[:bar_start] = start_date - self.date_from else coords[:bar_start] = 0 end - if end_date < self.date_to + if end_date <= self.date_to coords[:end] = end_date - self.date_from + 1 coords[:bar_end] = end_date - self.date_from + 1 else diff --git a/test/unit/lib/redmine/helpers/gantt_test.rb b/test/unit/lib/redmine/helpers/gantt_test.rb index 0067f4e2c..3a5522c85 100644 --- a/test/unit/lib/redmine/helpers/gantt_test.rb +++ b/test/unit/lib/redmine/helpers/gantt_test.rb @@ -431,6 +431,9 @@ class Redmine::Helpers::GanttHelperTest < Redmine::HelperTest @output_buffer = @gantt.line(today - 7, today + 7, 30, true, 'line', :format => :html, :zoom => 4) assert_select "div.starting", 1 assert_select 'div.starting[style*="left:28px"]', 1 + # starting marker on the leftmost boundary of the gantt + @output_buffer = @gantt.line(gantt_start, today + 7, 30, true, 'line', :format => :html, :zoom => 4) + assert_select 'div.starting[style*="left:0px"]', 1 end test "#line starting marker should not appear if the start date is before gantt start date" do @@ -444,6 +447,9 @@ class Redmine::Helpers::GanttHelperTest < Redmine::HelperTest @output_buffer = @gantt.line(today - 7, today + 7, 30, true, 'line', :format => :html, :zoom => 4) assert_select "div.ending", 1 assert_select 'div.ending[style*="left:88px"]', 1 + # ending marker on the rightmost boundary of the gantt + @output_buffer = @gantt.line(today - 7, gantt_end, 30, true, 'line', :format => :html, :zoom => 4) + assert_select 'div.ending[style*="left:116px"]', 1 end test "#line ending marker should not appear if the end date is before gantt start date" do |