##// END OF EJS Templates
jro_apps » redmine
RSS
Merged IssuesController#export_pdf into IssuesController#show....
Jean-Philippe Lang -
r799:fa094a3fe5f8
parent child
Show More
Show file before | Show file after | Hide comments
@@ -58,15 +58,17 class IssuesController < ApplicationController
58 end
58 end
59
59
60 def show
60 def show
61 @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
62 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
61 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
63 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
62 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
64 end
65
63
66 def export_pdf
64 if params[:format]=='pdf'
67 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
68 @options_for_rfpdf ||= {}
65 @options_for_rfpdf ||= {}
69 @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.id}.pdf"
66 @options_for_rfpdf[:file_name] = "#{@project.identifier}-#{@issue.id}.pdf"
67 render :template => 'issues/show.rfpdf', :layout => false
68 else
69 @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
70 render :template => 'issues/show.rhtml'
71 end
70 end
72 end
71
73
72 def edit
74 def edit
Show file before | Show file after | Hide comments
@@ -70,7 +70,7
70 pdf.SetFontStyle('B',9)
70 pdf.SetFontStyle('B',9)
71 pdf.Cell(190,5, l(:label_history), "B")
71 pdf.Cell(190,5, l(:label_history), "B")
72 pdf.Ln
72 pdf.Ln
73 for journal in issue.journals.find(:all, :include => :user, :order => "journals.created_on desc")
73 for journal in issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
74 pdf.SetFontStyle('B',8)
74 pdf.SetFontStyle('B',8)
75 pdf.Cell(190,5, format_time(journal.created_on) + " - " + journal.user.name)
75 pdf.Cell(190,5, format_time(journal.created_on) + " - " + journal.user.name)
76 pdf.Ln
76 pdf.Ln
@@ -86,6 +86,7
86 pdf.Ln
86 pdf.Ln
87 end
87 end
88
88
89 if issue.attachments.any?
89 pdf.SetFontStyle('B',9)
90 pdf.SetFontStyle('B',9)
90 pdf.Cell(190,5, l(:label_attachment_plural), "B")
91 pdf.Cell(190,5, l(:label_attachment_plural), "B")
91 pdf.Ln
92 pdf.Ln
@@ -97,4 +98,5
97 pdf.Cell(65,5, attachment.author.name,0,0,"R")
98 pdf.Cell(65,5, attachment.author.name,0,0,"R")
98 pdf.Ln
99 pdf.Ln
99 end
100 end
101 end
100 %>
102 %>
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, file renamed from app/views/issues/export_pdf.rfpdf to app/views/issues/show.rfpdf
NO CONTENT: modified file, file renamed from app/views/issues/export_pdf.rfpdf to app/views/issues/show.rfpdf
Show file before | Show file after | Hide comments
@@ -111,7 +111,7 end %>
111 <% end %>
111 <% end %>
112
112
113 <div class="contextual">
113 <div class="contextual">
114 <%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'icon icon-pdf' %>
114 <%= l(:label_export_to) %><%= link_to 'PDF', {:format => 'pdf'}, :class => 'icon icon-pdf' %>
115 </div>
115 </div>
116 &nbsp;
116 &nbsp;
117
117
Show file before | Show file after | Hide comments
@@ -25,7 +25,7 Redmine::AccessControl.map do |map|
25 map.permission :manage_categories, {:projects => [:settings, :add_issue_category], :issue_categories => [:edit, :destroy]}, :require => :member
25 map.permission :manage_categories, {:projects => [:settings, :add_issue_category], :issue_categories => [:edit, :destroy]}, :require => :member
26 # Issues
26 # Issues
27 map.permission :view_issues, {:projects => [:list_issues, :export_issues_csv, :export_issues_pdf, :changelog, :roadmap],
27 map.permission :view_issues, {:projects => [:list_issues, :export_issues_csv, :export_issues_pdf, :changelog, :roadmap],
28 :issues => [:show, :export_pdf],
28 :issues => :show,
29 :queries => :index,
29 :queries => :index,
30 :reports => :issue_report}, :public => true
30 :reports => :issue_report}, :public => true
31 map.permission :add_issues, {:projects => :add_issue}, :require => :loggedin
31 map.permission :add_issues, {:projects => :add_issue}, :require => :loggedin
General Comments 0
You need to be logged in to leave comments. Login now