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/wiki_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/wiki_controller.rb')
| -rw-r--r-- | app/controllers/wiki_controller.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb index f6dc0ffca..6f6c6bbdf 100644 --- a/app/controllers/wiki_controller.rb +++ b/app/controllers/wiki_controller.rb @@ -78,7 +78,7 @@ class WikiController < ApplicationController end if User.current.allowed_to?(:export_wiki_pages, @project) if params[:format] == 'pdf' - send_data(wiki_page_to_pdf(@page, @project), :type => 'application/pdf', :filename => "#{@page.title}.pdf") + send_file_headers! :type => 'application/pdf', :filename => "#{@page.title}.pdf" return elsif params[:format] == 'html' export = render_to_string :action => 'export', :layout => false @@ -283,9 +283,7 @@ class WikiController < ApplicationController send_data(export, :type => 'text/html', :filename => "wiki.html") } format.pdf { - send_data(wiki_pages_to_pdf(@pages, @project), - :type => 'application/pdf', - :filename => "#{@project.identifier}.pdf") + send_file_headers! :type => 'application/pdf', :filename => "#{@project.identifier}.pdf" } end end |