Merge pull request #51 from gopesht/delete_users

Admin able to delete users except admins
This commit is contained in:
Henne Vogelsang 2014-04-09 12:11:48 +02:00
commit c261876ce0
2 changed files with 19 additions and 0 deletions

View file

@ -15,5 +15,17 @@ class Admin::UsersController < ApplicationController
user = User.find(params[:id])
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

View file

@ -23,6 +23,7 @@
%b Roles
%th
%th
%th
- @users.each do |user|
- person = Person.find_person_by_user_id(user.id)
%tr
@ -69,6 +70,12 @@
"data-html" => "true",
"data-content" => user.popup_details,
"data-original-title" => ""
%td
- if current_user.id == user.id or user.role_ids.include? 3
=link_to 'Delete',admin_user_path(user), :method => :delete , :data => {:confirm => 'Are you sure ?'}, :disabled => true,:class => "btn btn-primary disabled btn-danger",:role => "button"
- else
=link_to 'Delete',admin_user_path(user), :method=> :delete , :data=> {:confirm => 'Are you sure ?'},:class => "btn btn-primary btn-danger"
:javascript
$(document).ready(function() {