jro_apps/redmine Commit - r4181:70bf0706b2f7

Refactor: convert WikiController#destroy to use HTTP DELETE...

Eric Davis -

r4181:70bf0706b2f7

parent child

Context file:

r4181:70bf0706b2f7

Collapse all files

app/controllers/wiki_controller.rb +3 -2

                before_filter :find_wiki, :authorize
                before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy]
-               verify :method => :post, :only => [:destroy, :protect], :redirect_to => { :action => :show }
+               verify :method => :post, :only => [:protect], :redirect_to => { :action => :show }
                helper :attachments
                include AttachmentsHelper
                  @annotate = @page.annotate(params[:version])
                  render_404 unless @annotate
                end
+               verify :method => :delete, :only => [:destroy], :redirect_to => { :action => :show }
                # Removes a wiki page and its history
                # Children can be either set as root pages, removed or reassigned to another parent page
                def destroy

app/views/wiki/destroy.rhtml +1 -1

              <h2><%=h @page.pretty_title %></h2>
-             <% form_tag({}) do %>
+             <% form_tag({}, :method => :delete) do %>
              <div class="box">
              <p><strong><%= l(:text_wiki_page_destroy_question, :descendants => @descendants_count) %></strong></p>
              <p><label><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_wiki_page_nullify_children) %></label><br />

app/views/wiki/show.rhtml +1 -1

              <%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :page => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
              <%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :page => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
              <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :page => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>
-             <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :page => @page.title}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
+             <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :page => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
              <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :page => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
              <% end %>
              <%= link_to_if_authorized(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>

config/routes.rb +3 -1

                  end
                  wiki_routes.connect 'projects/:project_id/wiki/:page/:action',
-                   :action => /rename|destroy|preview|protect|add_attachment/,
+                   :action => /rename|preview|protect|add_attachment/,
                    :conditions => {:method => :post}
                  wiki_routes.connect 'projects/:project_id/wiki/:page/edit', :action => 'update', :conditions => {:method => :post}
+                 wiki_routes.connect 'projects/:project_id/wiki/:page', :action => 'destroy', :conditions => {:method => :delete}
                end
                map.with_options :controller => 'messages' do |messages_routes|

test/functional/wiki_controller_test.rb +5 -5

                def test_destroy_child
                  @request.session[:user_id] = 2
-                 post :destroy, :project_id => 1, :page => 'Child_1'
+                 delete :destroy, :project_id => 1, :page => 'Child_1'
                  assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                end
                def test_destroy_parent
                  @request.session[:user_id] = 2
                  assert_no_difference('WikiPage.count') do
-                   post :destroy, :project_id => 1, :page => 'Another_page'
+                   delete :destroy, :project_id => 1, :page => 'Another_page'
                  end
                  assert_response :success
                  assert_template 'destroy'
                def test_destroy_parent_with_nullify
                  @request.session[:user_id] = 2
                  assert_difference('WikiPage.count', -1) do
-                   post :destroy, :project_id => 1, :page => 'Another_page', :todo => 'nullify'
+                   delete :destroy, :project_id => 1, :page => 'Another_page', :todo => 'nullify'
                  end
                  assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                  assert_nil WikiPage.find_by_id(2)
                def test_destroy_parent_with_cascade
                  @request.session[:user_id] = 2
                  assert_difference('WikiPage.count', -3) do
-                   post :destroy, :project_id => 1, :page => 'Another_page', :todo => 'destroy'
+                   delete :destroy, :project_id => 1, :page => 'Another_page', :todo => 'destroy'
                  end
                  assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                  assert_nil WikiPage.find_by_id(2)
                def test_destroy_parent_with_reassign
                  @request.session[:user_id] = 2
                  assert_difference('WikiPage.count', -1) do
-                   post :destroy, :project_id => 1, :page => 'Another_page', :todo => 'reassign', :reassign_to_id => 1
+                   delete :destroy, :project_id => 1, :page => 'Another_page', :todo => 'reassign', :reassign_to_id => 1
                  end
                  assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                  assert_nil WikiPage.find_by_id(2)

test/integration/routing_test.rb +2 -1

                  should_route :post, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'update', :project_id => '567', :page => 'my_page'
                  should_route :post, "/projects/567/wiki/CookBook_documentation/preview", :controller => 'wiki', :action => 'preview', :project_id => '567', :page => 'CookBook_documentation'
                  should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :page => 'ladida'
-                 should_route :post, "/projects/22/wiki/ladida/destroy", :controller => 'wiki', :action => 'destroy', :project_id => '22', :page => 'ladida'
                  should_route :post, "/projects/22/wiki/ladida/protect", :controller => 'wiki', :action => 'protect', :project_id => '22', :page => 'ladida'
                  should_route :post, "/projects/22/wiki/ladida/add_attachment", :controller => 'wiki', :action => 'add_attachment', :project_id => '22', :page => 'ladida'
+                 should_route :delete, "/projects/22/wiki/ladida", :controller => 'wiki', :action => 'destroy', :project_id => '22', :page => 'ladida'
                end
                context "wikis (plural, admin setup)" do

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