jro_apps/redmine Commit - r10493:6cccdce06eff

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

Jean-Philippe Lang -

r10493:6cccdce06eff

parent child

Context file:

r10493:6cccdce06eff

Collapse all files

test/unit/wiki_content_version_test.rb created 644 +68 0

@@ -0,0 +1,68
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2012 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../../test_helper', __FILE__)
	19
	20	class WikiContentTest < ActiveSupport::TestCase
	21	fixtures :projects, :users, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions
	22
	23	def setup
	24	end
	25
	26	def test_destroy
	27	v = WikiContent::Version.find(2)
	28
	29	assert_difference 'WikiContent::Version.count', -1 do
	30	v.destroy
	31	end
	32	end
	33
	34	def test_destroy_last_version_should_revert_content
	35	v = WikiContent::Version.find(3)
	36
	37	assert_no_difference 'WikiPage.count' do
	38	assert_no_difference 'WikiContent.count' do
	39	assert_difference 'WikiContent::Version.count', -1 do
	40	assert v.destroy
	41	end
	42	end
	43	end
	44	c = WikiContent.find(1)
	45	v = c.versions.last
	46	assert_equal 2, c.version
	47	assert_equal v.version, c.version
	48	assert_equal v.comments, c.comments
	49	assert_equal v.text, c.text
	50	assert_equal v.author, c.author
	51	assert_equal v.updated_on, c.updated_on
	52	end
	53
	54	def test_destroy_all_versions_should_delete_page
	55	WikiContent::Version.find(1).destroy
	56	WikiContent::Version.find(2).destroy
	57	v = WikiContent::Version.find(3)
	58
	59	assert_difference 'WikiPage.count', -1 do
	60	assert_difference 'WikiContent.count', -1 do
	61	assert_difference 'WikiContent::Version.count', -1 do
	62	assert v.destroy
	63	end
	64	end
	65	end
	66	assert_nil WikiPage.find_by_id(1)
	67	end
	68	end

app/controllers/wiki_controller.rb +9 -1

               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
                 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 +4 0

                 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 +15 0

                                                                       "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'
                     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 +4 -1

                 <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 %>

config/routes.rb +1 0

                 end
                 match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
                 get 'wiki/:id/:version', :to => 'wiki#show'
+                delete 'wiki/:id/:version', :to => 'wiki#destroy_version'
                 get 'wiki/:id/:version/annotate', :to => 'wiki#annotate'
                 get 'wiki/:id/:version/diff', :to => 'wiki#diff'
               end

lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb +1 -1

                     # Clones a model.  Used when saving a new version or reverting a model's version.
                     def clone_versioned_model(orig_model, new_model)
                       self.versioned_attributes.each do |key|
-                        new_model.send("#{key}=", orig_model.send(key)) if orig_model.has_attribute?(key)
+                        new_model.send("#{key}=", orig_model.send(key)) if orig_model.respond_to?(key)
                       end
             					if self.class.columns_hash.include?(self.class.inheritance_column)

lib/redmine.rb +1 -1

               map.project_module :wiki do |map|
                 map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                 map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
-                map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
+                map.permission :delete_wiki_pages, {:wiki => [:destroy, :destroy_version]}, :require => :member
                 map.permission :view_wiki_pages, {:wiki => [:index, :show, :special, :date_index]}, :read => true
                 map.permission :export_wiki_pages, {:wiki => [:export]}, :read => true
                 map.permission :view_wiki_edits, {:wiki => [:history, :diff, :annotate]}, :read => true

test/functional/wiki_controller_test.rb +22 -2

               end
               def test_history
+                @request.session[:user_id] = 2
                 get :history, :project_id => 'ecookbook', :id => 'CookBook_documentation'
                 assert_response :success
                 assert_template 'history'
                 assert_select "input[type=submit][name=commit]"
                 assert_select 'td' do
                   assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2', :text => '2'
-                  assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2/annotate'
+                  assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2/annotate', :text => 'Annotate'
+                  assert_select 'a[href=?]', '/projects/ecookbook/wiki/CookBook_documentation/2', :text => 'Delete'
                 end
               end
               def test_history_with_one_version
-                get :history, :project_id => 1, :id => 'Another_page'
+                @request.session[:user_id] = 2
+                get :history, :project_id => 'ecookbook', :id => 'Another_page'
                 assert_response :success
                 assert_template 'history'
                 assert_not_nil assigns(:versions)
                 assert_equal 1, assigns(:versions).size
                 assert_select "input[type=submit][name=commit]", false
+                assert_select 'td' do
+                  assert_select 'a[href=?]', '/projects/ecookbook/wiki/Another_page/1', :text => '1'
+                  assert_select 'a[href=?]', '/projects/ecookbook/wiki/Another_page/1/annotate', :text => 'Annotate'
+                  assert_select 'a[href=?]', '/projects/ecookbook/wiki/Another_page/1', :text => 'Delete', :count => 0
+                end
               end
               def test_diff
                 assert_equal WikiPage.find(1), WikiPage.find_by_id(5).parent
               end
+              def test_destroy_version
+                @request.session[:user_id] = 2
+                assert_difference 'WikiContent::Version.count', -1 do
+                  assert_no_difference 'WikiContent.count' do
+                    assert_no_difference 'WikiPage.count' do
+                      delete :destroy_version, :project_id => 'ecookbook', :id => 'CookBook_documentation', :version => 2
+                      assert_redirected_to '/projects/ecookbook/wiki/CookBook_documentation/history'
+                    end
+                  end
+                end
+              end
               def test_index
                 get :index, :project_id => 'ecookbook'
                 assert_response :success

test/integration/routing/wiki_test.rb +10 0

                        :id => 'CookBook_documentation' }
                    )
                 assert_routing(
+                     { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2" },
+                     { :controller => 'wiki', :action => 'show', :project_id => '1',
+                       :id => 'CookBook_documentation', :version => '2' }
+                   )
+                assert_routing(
                      { :method => 'get', :path => "/projects/1/wiki/CookBook_documentation/2/diff" },
                      { :controller => 'wiki', :action => 'diff', :project_id => '1',
                        :id => 'CookBook_documentation', :version => '2' }
                     { :controller => 'wiki', :action => 'destroy', :project_id => '22',
                       :id => 'ladida' }
                   )
+                assert_routing(
+                    { :method => 'delete', :path => "/projects/22/wiki/ladida/3" },
+                    { :controller => 'wiki', :action => 'destroy_version', :project_id => '22',
+                      :id => 'ladida', :version => '3' }
+                  )
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages