Ability to delete a version from a wiki page history (#10852).

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

app/controllers/wiki_controller.rb

@@ -35,7 +35,7 @@ class WikiController < ApplicationController
   default_search_scope :wiki_pages
   before_filter :find_wiki, :authorize
   before_filter :find_existing_or_new_page, :only => [:show, :edit, :update]
-  before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy]
+  before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy, :destroy_version]
 
   helper :attachments
   include AttachmentsHelper
@@ -237,6 +237,14 @@ class WikiController < ApplicationController
     redirect_to :action => 'index', :project_id => @project
   end
 
+  def destroy_version
+    return render_403 unless editable?
+
+    @content = @page.content_for_version(params[:version])
+    @content.destroy
+    redirect_to_referer_or :action => 'history', :id => @page.title, :project_id => @project
+  end
+
   # Export wiki to a single pdf or html file
   def export
     @pages = @wiki.pages.all(:order => 'title', :include => [:content, :attachments], :limit => 75)

app/helpers/application_helper.rb

@@ -147,6 +147,10 @@ module ApplicationHelper
     end
   end
 
+  def wiki_page_path(page, options={})
+    url_for({:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title}.merge(options))
+  end
+
   def thumbnail_tag(attachment)
     link_to image_tag(url_for(:controller => 'attachments', :action => 'thumbnail', :id => attachment)),
       {:controller => 'attachments', :action => 'show', :id => attachment, :filename => attachment.filename},

app/models/wiki_content.rb

@@ -73,6 +73,8 @@ class WikiContent < ActiveRecord::Base
                                                           "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id " +
                                                           "LEFT JOIN #{Project.table_name} ON #{Project.table_name}.id = #{Wiki.table_name}.project_id"}
 
+    after_destroy :page_update_after_destroy
+
     def text=(plain)
       case Setting.wiki_compression
       when 'gzip'
@@ -128,5 +130,18 @@ class WikiContent < ActiveRecord::Base
         includes(:author).
         where("wiki_content_id = ? AND version > ?", wiki_content_id, version).first
     end
+
+    private
+
+    # Updates page's content if the latest version is removed
+    # or destroys the page if it was the only version
+    def page_update_after_destroy
+      latest = page.content.versions.reorder("#{self.class.table_name}.version DESC").first
+      if latest && page.content.version != latest.version
+        raise ActiveRecord::Rollback unless page.content.revert_to!(latest)
+      elsif latest.nil?
+        raise ActiveRecord::Rollback unless page.destroy
+      end
+    end
   end
 end

app/views/wiki/history.html.erb

@@ -28,7 +28,10 @@
     <td class="updated_on"><%= format_time(ver.updated_on) %></td>
     <td class="author"><%= link_to_user ver.author %></td>
     <td class="comments"><%=h ver.comments %></td>
-    <td class="buttons"><%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %></td>
+    <td class="buttons">
+      <%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %>
+      <%= delete_link wiki_page_path(@page, :version => ver.version) if User.current.allowed_to?(:delete_wiki_pages, @page.project) && @version_count > 1 %>
+    </td>
 </tr>
 <% line_num += 1 %>
 <% end %>