diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index b30b1598..177c4566 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -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 \ No newline at end of file diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index dfc50d90..0bf89f7e 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -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() {