summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2020-03-20 06:25:01 +0000
committerGo MAEDA <maeda@farend.jp>2020-03-20 06:25:01 +0000
commit5e7091729178a9c6f4d0d9abc544730f074b6512 (patch)
tree314eba2c487321e40a94f4ce2e316d6059a5b02c
parentb025c9408bb8b134c5cc9655a4f4d8ec20fda795 (diff)
downloadredmine-5e7091729178a9c6f4d0d9abc544730f074b6512.tar.gz
redmine-5e7091729178a9c6f4d0d9abc544730f074b6512.zip
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
-rw-r--r--lib/redmine/helpers/gantt.rb6
1 files 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, '&nbsp;'.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)