jro_apps/redmine Commit - r8032:467503fd4b5a

Changed ProjectsController#destroy to DELETE only....

Jean-Philippe Lang -

r8032:467503fd4b5a

parent child

Context file:

r8032:467503fd4b5a

app/controllers/projects_controller.rb +6 -9

                 redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
               end
+              verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed }
               # Delete @project
               def destroy
                 @project_to_destroy = @project
-                if request.get?
+                if api_request? || params[:confirm]
-                  # display confirmation view
+                  @project_to_destroy.destroy
-                else
+                  respond_to do |format|
-                  if api_request? || params[:confirm]
+                    format.html { redirect_to :controller => 'admin', :action => 'projects' }
-                    @project_to_destroy.destroy
+                    format.api  { head :ok }
-                    respond_to do |format|
-                      format.html { redirect_to :controller => 'admin', :action => 'projects' }
-                      format.api  { head :ok }
-                    end
                   end
                 end
                 # hide project in layout

app/views/admin/projects.html.erb +1 -1

                 <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-lock') if project.active? %>
                 <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %>
                 <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
-                <%= link_to(l(:button_delete), project_destroy_confirm_path(project), :class => 'icon icon-del') %>
+                <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del') %>
               </td>
               </tr>
             <% end %>

config/routes.rb 0 -3

               end
-              # Destroy uses a get request to prompt the user before the actual DELETE request
-              map.project_destroy_confirm 'projects/:id/destroy', :controller => 'projects', :action => 'destroy', :conditions => {:method => :get}
               # TODO: port to be part of the resources route(s)
               map.with_options :controller => 'projects' do |project_mapper|
                 project_mapper.with_options :conditions => {:method => :get} do |project_views|

test/functional/projects_controller_test.rb +4 -4

                 assert_response :method_not_allowed
               end
-              def test_get_destroy
+              def test_destroy_without_confirmation
                 @request.session[:user_id] = 1 # admin
-                get :destroy, :id => 1
+                delete :destroy, :id => 1
                 assert_response :success
                 assert_template 'destroy'
                 assert_not_nil Project.find_by_id(1)
               end
-              def test_post_destroy
+              def test_destroy
                 @request.session[:user_id] = 1 # admin
-                post :destroy, :id => 1, :confirm => 1
+                delete :destroy, :id => 1, :confirm => 1
                 assert_redirected_to '/admin/projects'
                 assert_nil Project.find_by_id(1)
               end

General Comments 0

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

No TODOs yet

	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