Commit 74d6e492d37ffb42a63e482308b72e45b0c6da36
1 parent
7db71b94
Exists in
master
and in
4 other branches
More data: confirm
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
1 changed file
with
5 additions
and
5 deletions
Show diff stats
app/views/admin/users/show.html.haml
| ... | ... | @@ -76,7 +76,7 @@ |
| 76 | 76 | %li User will be removed from joined projects and groups |
| 77 | 77 | %li Personal projects will be left |
| 78 | 78 | %li Owned groups will be left |
| 79 | - = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-new", confirm: 'Are you sure?' | |
| 79 | + = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-new", data: { confirm: 'Are you sure?' } | |
| 80 | 80 | - else |
| 81 | 81 | .alert |
| 82 | 82 | %h4 Block this user |
| ... | ... | @@ -88,7 +88,7 @@ |
| 88 | 88 | %li User will be removed from joined projects and groups |
| 89 | 89 | %li Personal projects will be left |
| 90 | 90 | %li Owned groups will be left |
| 91 | - = link_to 'Block user', block_admin_user_path(@user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-remove" | |
| 91 | + = link_to 'Block user', block_admin_user_path(@user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put, class: "btn btn-remove" | |
| 92 | 92 | |
| 93 | 93 | .alert.alert-error |
| 94 | 94 | %h4 |
| ... | ... | @@ -104,7 +104,7 @@ |
| 104 | 104 | %li |
| 105 | 105 | Next groups with all content will be removed: |
| 106 | 106 | %strong #{@user.solo_owned_groups.map(&:name).join(', ')} |
| 107 | - = link_to 'Remove user', [:admin, @user], confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn btn-remove" | |
| 107 | + = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove" | |
| 108 | 108 | |
| 109 | 109 | .span6 |
| 110 | 110 | - if @user.users_groups.present? |
| ... | ... | @@ -118,7 +118,7 @@ |
| 118 | 118 | .pull-right |
| 119 | 119 | %span.light= user_group.human_access |
| 120 | 120 | - unless user_group.owner? |
| 121 | - = link_to group_users_group_path(group, user_group), confirm: remove_user_from_group_message(group, @user), method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do | |
| 121 | + = link_to group_users_group_path(group, user_group), data: { confirm: remove_user_from_group_message(group, @user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do | |
| 122 | 122 | %i.icon-remove.icon-white |
| 123 | 123 | |
| 124 | 124 | .ui-box |
| ... | ... | @@ -138,7 +138,7 @@ |
| 138 | 138 | %span.light= tm.human_access |
| 139 | 139 | |
| 140 | 140 | - if tm.respond_to? :project |
| 141 | - = link_to project_team_member_path(project, @user), confirm: remove_from_project_team_message(project, @user), remote: true, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from project' do | |
| 141 | + = link_to project_team_member_path(project, @user), data: { confirm: remove_from_project_team_message(project, @user) }, remote: true, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from project' do | |
| 142 | 142 | %i.icon-remove |
| 143 | 143 | |
| 144 | 144 | ... | ... |