From 66e30b323c909a2dfc6011d23da2f31abaf30a32 Mon Sep 17 00:00:00 2001 From: evazion Date: Sat, 14 Jan 2017 23:34:07 +0000 Subject: [PATCH] Name changes: remove delete request button. --- app/controllers/user_name_change_requests_controller.rb | 8 +------- app/views/user_name_change_requests/show.html.erb | 6 ------ .../user_name_change_requests_controller_test.rb | 7 ------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/app/controllers/user_name_change_requests_controller.rb b/app/controllers/user_name_change_requests_controller.rb index 9c2eaaf61..ddfdbd734 100644 --- a/app/controllers/user_name_change_requests_controller.rb +++ b/app/controllers/user_name_change_requests_controller.rb @@ -1,6 +1,6 @@ class UserNameChangeRequestsController < ApplicationController before_filter :gold_only, :only => [:new, :create, :show] - before_filter :admin_only, :only => [:index, :approve, :reject, :destroy] + before_filter :admin_only, :only => [:index, :approve, :reject] rescue_from User::PrivilegeError, :with => :access_denied def new @@ -38,12 +38,6 @@ class UserNameChangeRequestsController < ApplicationController redirect_to user_name_change_request_path(@change_request), :notice => "Name change request approved" end - def destroy - @change_request = UserNameChangeRequest.find(params[:id]) - @change_request.destroy - redirect_to user_name_change_requests_path - end - def reject @change_request = UserNameChangeRequest.find(params[:id]) @change_request.reject!(params[:reason]) diff --git a/app/views/user_name_change_requests/show.html.erb b/app/views/user_name_change_requests/show.html.erb index 6e4f5f4c2..bc7e75f54 100644 --- a/app/views/user_name_change_requests/show.html.erb +++ b/app/views/user_name_change_requests/show.html.erb @@ -83,10 +83,4 @@ <% end %> <% end %> - -
- <%= form_tag(user_name_change_request_path(@change_request), :method => :delete) do %> - <%= submit_tag "Delete" %> - <% end %> -
diff --git a/test/functional/user_name_change_requests_controller_test.rb b/test/functional/user_name_change_requests_controller_test.rb index 03752e1a9..d9ae1fd41 100644 --- a/test/functional/user_name_change_requests_controller_test.rb +++ b/test/functional/user_name_change_requests_controller_test.rb @@ -61,13 +61,6 @@ class UserNameChangeRequestsControllerTest < ActionController::TestCase assert_redirected_to(user_name_change_request_path(@change_request)) end end - - context "destroy action" do - should "destroy" do - post :destroy, {:id => @change_request.id}, {:user_id => @admin.id} - assert_redirected_to(user_name_change_requests_path) - end - end end end end