Merged r19935 from trunk to 4.1-stable (#33140).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19936 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-07-25 08:54:29 +00:00
parent 30ed1a4be2
commit 36f4a0130e
2 changed files with 27 additions and 1 deletions

View File

@@ -623,7 +623,7 @@ module Redmine
def coordinates(start_date, end_date, progress, zoom=nil)
zoom ||= @zoom
coords = {}
if start_date && end_date && start_date < self.date_to && end_date > self.date_from
if start_date && end_date && start_date <= self.date_to && end_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