fix users list actions

app/views/admin/users/index.html.haml

@@ -16,9 +16,7 @@
         %th Name
         %th Attended Conferences
         %th Roles
-        %th View
+        %th Actions
-        %th Edit
-        %th Delete
       %tbody
         - @users.each do |user|
           %tr
@@ -42,16 +40,15 @@
                   = '...'
               - else
                 None
+            %td{width: '170px'}
+              .btn-group
                 - if can? :show, user
-              %td
                   = link_to 'View', admin_user_path(user), class: 'btn btn-success'
                 - if can? :update, user
-              %td
                   = link_to 'Edit', edit_admin_user_path(user), class: 'btn btn-primary'
                 - if can? :destroy, user
-              %td
+                  - if current_user.id == user.id
-                - 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 ?'},
-                  = 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,