kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Display project names in cross-project gantt PNG (#5904). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3885 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-07-25 11:43:19 +00:00
parent bdad35a736
commit 701d2eaeac
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/gantts_controller.rb
View File

@ -37,7 +37,7 @@ class GanttsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html { render :action => "show", :layout => !request.xhr? } format.html { render :action => "show", :layout => !request.xhr? }
format.png { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image') format.png { send_data(@gantt.to_image(@project), :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image')
format.pdf { send_data(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{basename}.pdf") } format.pdf { send_data(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{basename}.pdf") }
end end
end end

13
lib/redmine/helpers/gantt.rb
View File

@ -91,12 +91,12 @@ module Redmine
# Generates a gantt image # Generates a gantt image
# Only defined if RMagick is avalaible # Only defined if RMagick is avalaible
def to_image(format='PNG') def to_image(project, format='PNG')
date_to = (@date_from >> @months)-1 date_to = (@date_from >> @months)-1
show_weeks = @zoom > 1 show_weeks = @zoom > 1
show_days = @zoom > 2 show_days = @zoom > 2
subject_width = 320 subject_width = 400
header_heigth = 18 header_heigth = 18
# width of one day in pixels # width of one day in pixels
zoom = @zoom*2 zoom = @zoom*2
@ -115,7 +115,14 @@ module Redmine
gc.stroke('transparent') gc.stroke('transparent')
gc.stroke_width(1) gc.stroke_width(1)
events.each do |i| events.each do |i|
gc.text(4, top + 2, (i.is_a?(Issue) ? i.subject : i.name)) text = ""
if i.is_a? Issue
text = "#{i.tracker} #{i.id}: #{i.subject}"
else
text = i.name
end
text = "#{i.project} - #{text}" unless project && project == i.project
gc.text(4, top + 2, text)
top = top + 20 top = top + 20
end end