diff app/controllers/.svn/text-base/users_controller.rb.svn-base @ 128:07fa8a8b56a8

Update to Redmine trunk rev 4732

--- a/app/controllers/.svn/text-base/users_controller.rb.svn-base	Thu Jan 13 14:12:06 2011 +0000
+++ b/app/controllers/.svn/text-base/users_controller.rb.svn-base	Wed Jan 19 15:04:22 2011 +0000
@@ -19,8 +19,8 @@
   layout 'admin'
   
   before_filter :require_admin, :except => :show
-  before_filter :find_user, :only => [:show, :edit, :update, :edit_membership, :destroy_membership]
-  accept_key_auth :index, :show, :create, :update
+  before_filter :find_user, :only => [:show, :edit, :update, :destroy, :edit_membership, :destroy_membership]
+  accept_key_auth :index, :show, :create, :update, :destroy
 
   helper :sort
   include SortHelper
@@ -177,6 +177,15 @@
     redirect_to :controller => 'users', :action => 'edit', :id => @user
   end
 
+  verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed }
+  def destroy
+    @user.destroy
+    respond_to do |format|
+      format.html { redirect_to(users_url) }
+      format.api  { head :ok }
+    end
+  end
+
   def edit_membership
     @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
     @membership.save if request.post?