summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2021-07-31 06:21:35 +0000
committerGo MAEDA <maeda@farend.jp>2021-07-31 06:21:35 +0000
commit0c8fcd1a51918cc9e62b6cc1a4a0a879a12fd500 (patch)
treee364147545478764553151a2b60fea3a894b9c03 /lib
parentcb467fee8eb85924faf592855b0b3f99ed51a30a (diff)
downloadredmine-0c8fcd1a51918cc9e62b6cc1a4a0a879a12fd500.tar.gz
redmine-0c8fcd1a51918cc9e62b6cc1a4a0a879a12fd500.zip
Progress bar for a shared version on gantt disappears when the tree is collapsed and then expanded (#34694).
Patch by Yuichi HARADA. git-svn-id: http://svn.redmine.org/redmine/trunk@21115 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/helpers/gantt.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb
index 882a8b750..6b40bc844 100644
--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -346,6 +346,7 @@ module Redmine
if options[:format] == :html
data_options = {}
data_options[:collapse_expand] = "issue-#{issue.id}"
+ data_options[:number_of_rows] = number_of_rows
style = "position: absolute;top: #{options[:top]}px; font-size: 0.8em;"
content =
view.content_tag(
@@ -779,6 +780,7 @@ module Redmine
:top_increment => params[:top_increment],
:obj_id => "#{object.class}-#{object.id}".downcase,
},
+ :number_of_rows => number_of_rows,
}
end
if has_children
@@ -834,7 +836,10 @@ module Redmine
def html_task(params, coords, markers, label, object)
output = +''
data_options = {}
- data_options[:collapse_expand] = "#{object.class}-#{object.id}".downcase if object
+ if object
+ data_options[:collapse_expand] = "#{object.class}-#{object.id}".downcase
+ data_options[:number_of_rows] = number_of_rows
+ end
css = "task " +
case object
when Project