From 5e7091729178a9c6f4d0d9abc544730f074b6512 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Fri, 20 Mar 2020 06:25:01 +0000 Subject: [PATCH] Merged r19595 from trunk to 4.0-stable (#19248). git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19597 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/helpers/gantt.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb index 32d7604ee..b78fe6664 100644 --- a/lib/redmine/helpers/gantt.rb +++ b/lib/redmine/helpers/gantt.rb @@ -581,7 +581,7 @@ module Redmine coords[:bar_start] = 0 end if end_date < self.date_to - coords[:end] = end_date - self.date_from + coords[:end] = end_date - self.date_from + 1 coords[:bar_end] = end_date - self.date_from + 1 else coords[:bar_end] = self.date_to - self.date_from + 1 @@ -820,7 +820,7 @@ module Redmine if coords[:end] style = "" style << "top:#{params[:top]}px;" - style << "left:#{coords[:end] + params[:zoom]}px;" + style << "left:#{coords[:end]}px;" style << "width:15px;" output << view.content_tag(:div, ' '.html_safe, :style => style, @@ -943,7 +943,7 @@ module Redmine params[:image].polygon(x - 4, y, x, y - 4, x + 4, y, x, y + 4) end if coords[:end] - x = params[:subject_width] + coords[:end] + params[:zoom] + x = params[:subject_width] + coords[:end] y = params[:top] - height / 2 params[:image].fill('blue') params[:image].polygon(x - 4, y, x, y - 4, x + 4, y, x, y + 4) -- 2.39.5