comparison app/controllers/wiki_controller.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

   before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy]
 
   helper :attachments
   include AttachmentsHelper
   helper :watchers
+  include Redmine::Export::PDF
 
   # List of pages, sorted alphabetically and by parent (hierarchy)
   def index
     load_pages_for_index
     @pages_by_parent_id = @pages.group_by(&:parent_id)

       redirect_to :version => nil
       return
     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
       elsif params[:format] == 'txt'
         send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
         return
       end
     end
     @editable = editable?
+    @sections_editable = @editable && User.current.allowed_to?(:edit_wiki_pages, @page.project) &&
+      @content.current_version? &&
+      Redmine::WikiFormatting.supports_section_edit?
+
     render :action => 'show'
   end
 
   # edit an existing page or a new one
   def edit

     # don't keep previous comment
     @content.comments = nil
 
     # To prevent StaleObjectError exception when reverting to a previous version
     @content.version = @page.content.version
+    
+    @text = @content.text
+    if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
+      @section = params[:section].to_i
+      @text, @section_hash = Redmine::WikiFormatting.formatter.new(@text).get_section(@section)
+      render_404 if @text.blank?
+    end
   end
 
   verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
   # Creates a new page or updates an existing one
   def update

       render_attachment_warning_if_needed(@page)
       # don't save if text wasn't changed
       redirect_to :action => 'show', :project_id => @project, :id => @page.title
       return
     end
-    @content.attributes = params[:content]
+    
+    @content.comments = params[:content][:comments]
+    @text = params[:content][:text]
+    if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
+      @section = params[:section].to_i
+      @section_hash = params[:section_hash]
+      @content.text = Redmine::WikiFormatting.formatter.new(@content.text).update_section(params[:section].to_i, @text, @section_hash)
+    else
+      @content.version = params[:content][:version]
+      @content.text = @text
+    end
     @content.author = User.current
     # if page is new @page.save will also save content, but not if page isn't a new record
     if (@page.new_record? ? @page.save : @content.save)
       attachments = Attachment.attach_files(@page, params[:attachments])
       render_attachment_warning_if_needed(@page)

       redirect_to :action => 'show', :project_id => @project, :id => @page.title
     else
       render :action => 'edit'
     end
 
-  rescue ActiveRecord::StaleObjectError
+  rescue ActiveRecord::StaleObjectError, Redmine::WikiFormatting::StaleSectionError
     # Optimistic locking exception
     flash.now[:error] = l(:notice_locking_conflict)
     render :action => 'edit'
   end