pdf: add a new feature to export wiki pdf (#401)

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7741 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index d95f9ba25bfaafd4d174a1a6bd0ca8495ab19075..8111a617bcfd28baba2b2fdfe77228b473f97d09 100644 (file)
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -40,6 +40,7 @@ class WikiController < ApplicationController
   helper :attachments
   include AttachmentsHelper
   helper :watchers
+  include Redmine::Export::PDF
 
   # List of pages, sorted alphabetically and by parent (hierarchy)
   def index
@@ -71,7 +72,10 @@ class WikiController < ApplicationController
     end
     @content = @page.content_for_version(params[:version])
     if User.current.allowed_to?(:export_wiki_pages, @project)
-      if params[:format] == 'html'
+      if params[:format] == 'pdf'
+        send_data(wiki_to_pdf(@page, @project), :type => 'application/pdf', :filename => "#{@page.title}.pdf")
+        return
+      elsif params[:format] == 'html'
         export = render_to_string :action => 'export', :layout => false
         send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
         return

diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index ef17112f1ecdd5084250f89a043e374395767339..564fc8980f390cf318654f8a46cf7a8e1f958ddb 100644 (file)
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -53,6 +53,7 @@
 <% end %>
 
 <% other_formats_links do |f| %>
+  <%= f.link_to 'PDF', :url => {:id => @page.title, :version => @content.version} %>
   <%= f.link_to 'HTML', :url => {:id => @page.title, :version => @content.version} %>
   <%= f.link_to 'TXT', :url => {:id => @page.title, :version => @content.version} %>
 <% end if User.current.allowed_to?(:export_wiki_pages, @project) %>