diff -Nur redmine-0.9.4-clean/app/controllers/issues_controller.rb redmine-0.9.4-patched/app/controllers/issues_controller.rb --- redmine-0.9.4-clean/app/controllers/issues_controller.rb 2010-05-01 07:43:49.000000000 -0500 +++ redmine-0.9.4-patched/app/controllers/issues_controller.rb 2010-07-01 15:12:33.948001482 -0500 @@ -116,7 +116,8 @@ respond_to do |format| format.html { render :template => 'issues/show.rhtml' } format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' } - format.pdf { send_data(issue_to_pdf(@issue), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") } + format.pdf { send_data(issue_to_pdf(@issue), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf", + :disposition => 'inline') } end end diff -Nur redmine-0.9.4-clean/app/controllers/projects_controller.rb redmine-0.9.4-patched/app/controllers/projects_controller.rb --- redmine-0.9.4-clean/app/controllers/projects_controller.rb 2010-05-01 07:43:49.000000000 -0500 +++ redmine-0.9.4-patched/app/controllers/projects_controller.rb 2010-07-01 15:20:44.076057803 -0500 @@ -41,11 +41,13 @@ include CustomFieldsHelper helper :issues helper IssuesHelper + include IssuesHelper helper :queries include QueriesHelper helper :repositories include RepositoriesHelper include ProjectsHelper + include Redmine::Export::PDF # Lists visible projects def index @@ -329,7 +331,15 @@ @issues_by_version[version] = issues end end - @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].empty?} + @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?} + + respond_to do |format| + format.html { render :template => 'projects/roadmap.rhtml' } + format.pdf { send_data(versions_to_pdf(@versions, @issues_by_version), + :type => 'application/pdf', + :filename => "#{@project.identifier}-roadmap.pdf", + :disposition => 'inline') } + end end def activity diff -Nur redmine-0.9.4-clean/app/controllers/versions_controller.rb redmine-0.9.4-patched/app/controllers/versions_controller.rb --- redmine-0.9.4-clean/app/controllers/versions_controller.rb 2010-05-01 07:43:49.000000000 -0500 +++ redmine-0.9.4-patched/app/controllers/versions_controller.rb 2010-07-01 15:23:57.920050615 -0500 @@ -23,8 +23,16 @@ helper :custom_fields helper :projects + helper :issues + include IssuesHelper + include Redmine::Export::PDF def show + respond_to do |format| + format.html { render :template => 'versions/show.rhtml' } + format.pdf { send_data(version_to_pdf(@version), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@version.id}.pdf", + :disposition => 'inline') } + end end def edit diff -Nur redmine-0.9.4-clean/app/helpers/versions_helper.rb redmine-0.9.4-patched/app/helpers/versions_helper.rb --- redmine-0.9.4-clean/app/helpers/versions_helper.rb 2010-05-01 07:43:49.000000000 -0500 +++ redmine-0.9.4-patched/app/helpers/versions_helper.rb 2010-07-01 15:25:24.636323004 -0500 @@ -16,6 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. module VersionsHelper + include IssuesHelper STATUS_BY_CRITERIAS = %w(category tracker priority author assigned_to) diff -Nur redmine-0.9.4-clean/app/models/issue.rb redmine-0.9.4-patched/app/models/issue.rb --- redmine-0.9.4-clean/app/models/issue.rb 2010-05-01 07:43:49.000000000 -0500 +++ redmine-0.9.4-patched/app/models/issue.rb 2010-07-01 15:41:30.140136642 -0500 @@ -58,6 +58,9 @@ named_scope :open, :conditions => ["#{IssueStatus.table_name}.is_closed = ?", false], :include => :status + named_scope :for_roadmap, :include => [:status, :project, :tracker], + :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id" + before_save :update_done_ratio_from_issue_status after_save :create_journal diff -Nur redmine-0.9.4-clean/app/views/projects/roadmap.rhtml redmine-0.9.4-patched/app/views/projects/roadmap.rhtml --- redmine-0.9.4-clean/app/views/projects/roadmap.rhtml 2010-05-01 07:43:50.000000000 -0500 +++ redmine-0.9.4-patched/app/views/projects/roadmap.rhtml 2010-07-01 15:46:02.212030406 -0500 @@ -21,6 +21,11 @@ <%= call_hook :view_projects_roadmap_version_bottom, :version => version %> <% end %> + +<% other_formats_links do |f| %> + <%= f.link_to 'PDF' %> +<% end %> + <% end %> <% content_for :sidebar do %> diff -Nur redmine-0.9.4-clean/app/views/versions/show.rhtml redmine-0.9.4-patched/app/views/versions/show.rhtml --- redmine-0.9.4-clean/app/views/versions/show.rhtml 2010-05-01 07:43:49.000000000 -0500 +++ redmine-0.9.4-patched/app/views/versions/show.rhtml 2010-07-01 15:52:25.740023279 -0500 @@ -32,9 +32,7 @@ <%= render :partial => 'versions/overview', :locals => {:version => @version} %> <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %> -<% issues = @version.fixed_issues.find(:all, - :include => [:status, :tracker, :priority], - :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") %> +<% issues = @version.fixed_issues.for_roadmap %> <% if issues.size > 0 %>