jro_apps/redmine Commit - r799:fa094a3fe5f8

Merged IssuesController#export_pdf into IssuesController#show....

Jean-Philippe Lang -

r799:fa094a3fe5f8

parent child

Context file:

r799:fa094a3fe5f8

Collapse all files

app/controllers/issues_controller.rb +9 -7

                end
                def show
-                 @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
                  @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
                  @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
-               end
-               def export_pdf
-                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
-                 @options_for_rfpdf ||= {}
-                 @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.id}.pdf"
+                 if params[:format]=='pdf'
+                   @options_for_rfpdf ||= {}
+                   @options_for_rfpdf[:file_name] = "#{@project.identifier}-#{@issue.id}.pdf"
+                   render :template => 'issues/show.rfpdf', :layout => false
+                 else
+                   @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
+                   render :template => 'issues/show.rhtml'
+                 end
                end
                def edit

app/views/issues/_pdf.rfpdf +13 -11

                  pdf.SetFontStyle('B',9)
                  pdf.Cell(190,5, l(:label_history), "B")
                  pdf.Ln
-             	for journal in issue.journals.find(:all, :include => :user, :order => "journals.created_on desc")
+             	for journal in issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
              		pdf.SetFontStyle('B',8)
              	    pdf.Cell(190,5, format_time(journal.created_on) + " - " + journal.user.name)
              	    pdf.Ln
              		pdf.Ln
              	end
-                 pdf.SetFontStyle('B',9)
-                 pdf.Cell(190,5, l(:label_attachment_plural), "B")
-             	pdf.Ln
-             	for attachment in issue.attachments
-             		pdf.SetFontStyle('',8)
-             	    pdf.Cell(80,5, attachment.filename)
-             		pdf.Cell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
-             		pdf.Cell(25,5, format_date(attachment.created_on),0,0,"R")
-             		pdf.Cell(65,5, attachment.author.name,0,0,"R")
+             	if issue.attachments.any?
+             	    pdf.SetFontStyle('B',9)
+             	    pdf.Cell(190,5, l(:label_attachment_plural), "B")
              		pdf.Ln
+             		for attachment in issue.attachments
+             			pdf.SetFontStyle('',8)
+             		    pdf.Cell(80,5, attachment.filename)
+             			pdf.Cell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
+             			pdf.Cell(25,5, format_date(attachment.created_on),0,0,"R")
+             			pdf.Cell(65,5, attachment.author.name,0,0,"R")
+             			pdf.Ln
+             		end
              	end
-             %>
  No newline at end of file
+             %>

app/views/issues/show.rfpdf ~~app/views/issues/export_pdf.rfpdf~~ renamed +1 -1

              	render :partial => 'issues/pdf', :locals => { :pdf => pdf, :issue => @issue }
              %>
-             <%= pdf.Output %>
  No newline at end of file
+             <%= pdf.Output %>

app/views/issues/show.rhtml +1 -1

              <% end %>
              <div class="contextual">
-             <%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'icon icon-pdf' %>
+             <%= l(:label_export_to) %><%= link_to 'PDF', {:format => 'pdf'}, :class => 'icon icon-pdf' %>
              </div>
              &nbsp;

lib/redmine.rb +1 -1

                  map.permission :manage_categories, {:projects => [:settings, :add_issue_category], :issue_categories => [:edit, :destroy]}, :require => :member
                  # Issues
                  map.permission :view_issues, {:projects => [:list_issues, :export_issues_csv, :export_issues_pdf, :changelog, :roadmap],
-                                               :issues => [:show, :export_pdf],
+                                               :issues => :show,
                                                :queries => :index,
                                                :reports => :issue_report}, :public => true
                  map.permission :add_issues, {:projects => :add_issue}, :require => :loggedin

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages