Merge pull request #51 from gopesht/delete_users
Admin able to delete users except admins
This commit is contained in:
commit
c261876ce0
2 changed files with 19 additions and 0 deletions
|
|
@ -15,5 +15,17 @@ class Admin::UsersController < ApplicationController
|
||||||
user = User.find(params[:id])
|
user = User.find(params[:id])
|
||||||
user.update_attributes!(params[:user])
|
user.update_attributes!(params[:user])
|
||||||
redirect_to admin_users_path, :notice => "Updated #{user.email}"
|
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
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
@ -23,6 +23,7 @@
|
||||||
%b Roles
|
%b Roles
|
||||||
%th
|
%th
|
||||||
%th
|
%th
|
||||||
|
%th
|
||||||
- @users.each do |user|
|
- @users.each do |user|
|
||||||
- person = Person.find_person_by_user_id(user.id)
|
- person = Person.find_person_by_user_id(user.id)
|
||||||
%tr
|
%tr
|
||||||
|
|
@ -69,6 +70,12 @@
|
||||||
"data-html" => "true",
|
"data-html" => "true",
|
||||||
"data-content" => user.popup_details,
|
"data-content" => user.popup_details,
|
||||||
"data-original-title" => ""
|
"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
|
:javascript
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue