gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 06bda7a7db into bca62e6204

Browse source
This commit is contained in:
Stella Rouzi 2014-12-19 11:19:12 +00:00
commit 414c98bd9d
2 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/osem.css.scss
View file

@ -53,4 +53,8 @@ body {
fieldset {
margin: 20px 0 20px 0;
}
}
.col-actions {
width: 170px;
}

31
app/views/admin/users/index.html.haml
View file

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