Add project names to the Versions in the Gantt export. #5904

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4073 e93f8b46-1217-0410-a6f0-8f06a7374b81

Add project names to the Versions in the Gantt export. #5904
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4073 e93f8b46-1217-0410-a6f0-8f06a7374b81
abf3ee49 · Eric Davis · bdb3937e · abf3ee49 · abf3ee49
Commit abf3ee49 authored Sep 10, 2010 by Eric Davis
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

version.rb app/models/version.rb +4 -0

gantt.rb lib/redmine/helpers/gantt.rb +2 -2

No files found.
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -135,6 +135,10 @@ class Version < ActiveRecord::Base
  end
  
  def to_s; name end
+
+  def to_s_with_project
+    "#{project} - #{name}"
+  end
  
  # Versions are sorted by effective_date and "Project Name - Version name"
  # Those with no effective_date are at the end, sorted by "Project Name - Version name"

--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -399,13 +399,13 @@ module Redmine
          options[:image].fill('black')
          options[:image].stroke('transparent')
          options[:image].stroke_width(1)
-          options[:image].text(options[:indent], options[:top] + 2, version.name)
+          options[:image].text(options[:indent], options[:top] + 2, version.to_s_with_project)
        when :pdf
          options[:pdf].SetY(options[:top])
          options[:pdf].SetX(15)
          
          char_limit = PDF::MaxCharactorsForSubject - options[:indent]
-          options[:pdf].Cell(options[:subject_width]-15, 5, (" " * options[:indent]) +"#{version.name}".sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR")
+          options[:pdf].Cell(options[:subject_width]-15, 5, (" " * options[:indent]) +"#{version.to_s_with_project}".sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR")
        
          options[:pdf].SetY(options[:top])
          options[:pdf].SetX(options[:subject_width])