Merge 521d2dc72f into b64cc9f7e4

2014-03-17 15:35:34 +00:00 · 2014-03-17 15:35:34 +00:00 · 1421241df5
commit 1421241df5
parent b64cc9f7e4 521d2dc72f
8 changed files with 30 additions and 23 deletions
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@ -16,4 +16,15 @@ class Admin::UsersController < ApplicationController
    user.update_attributes!(params[:user])
    redirect_to admin_users_path, :notice => "Updated #{user.email}"
  end  
+
+  def delete
+    @user = User.find(params[:id])
+  end
+
+  def destroy
+    @user = User.find(params[:id])
+    @user.destroy
+    redirect_to admin_users_path, :notice => "User got deleted"
+    
+  end
 end