diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-01-25 09:04:52 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-01-25 09:04:52 +0000 |
| commit | 7a0432d85c01e36564f80d598e1d43dad148875a (patch) | |
| tree | 7ce0df3b8f188225fff680e964dd3b6e0a9f209a /app/controllers/issues_controller.rb | |
| parent | 3a7847c785e34ffef0479a1f07268bf059088878 (diff) | |
| download | redmine-7a0432d85c01e36564f80d598e1d43dad148875a.tar.gz redmine-7a0432d85c01e36564f80d598e1d43dad148875a.zip | |
Adds support for macro and Redmine links in PDF export (#13051).
git-svn-id: http://svn.redmine.org/redmine/trunk@13944 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/issues_controller.rb')
| -rw-r--r-- | app/controllers/issues_controller.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index b8ec626da..d1cac203e 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -49,7 +49,6 @@ class IssuesController < ApplicationController include SortHelper include IssuesHelper helper :timelog - include Redmine::Export::PDF def index retrieve_query @@ -89,7 +88,7 @@ class IssuesController < ApplicationController } format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") } format.csv { send_data(query_to_csv(@issues, @query, params), :type => 'text/csv; header=present', :filename => 'issues.csv') } - format.pdf { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'issues.pdf') } + format.pdf { send_file_headers! :type => 'application/pdf', :filename => 'issues.pdf' } end else respond_to do |format| @@ -130,8 +129,7 @@ class IssuesController < ApplicationController format.api format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' } format.pdf { - pdf = issue_to_pdf(@issue, :journals => @journals) - send_data(pdf, :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") + send_file_headers! :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf" } end end |