Patch #43640 » 0004-Ensure-correct-redirect-after-user-removal-conf.patch
| app/controllers/groups_controller.rb | ||
|---|---|---|
| 117 | 117 |
@users = User.not_in_group(@group).where(:id => (params[:user_id] || params[:user_ids])).to_a |
| 118 | 118 |
@group.users << @users |
| 119 | 119 |
respond_to do |format| |
| 120 |
format.html {redirect_back_or_default edit_group_path(@group, :tab => 'users')}
|
|
| 120 |
format.html do |
|
| 121 |
flash[:notice] = l(:notice_successful_update) |
|
| 122 |
redirect_back_or_default edit_group_path(@group, :tab => 'users') |
|
| 123 |
end |
|
| 121 | 124 |
format.js |
| 122 | 125 |
format.api do |
| 123 | 126 |
if @users.any? |
| ... | ... | |
| 131 | 134 | |
| 132 | 135 |
def remove_users |
| 133 | 136 |
@users = @group.users.where(:id => (params[:user_id] || params[:user_ids])).to_a |
| 134 | ||
| 137 |
@back = back_url |
|
| 135 | 138 |
if @users.empty? |
| 136 | 139 |
render_404 |
| 137 | 140 |
return |
| app/views/groups/remove_users.erb | ||
|---|---|---|
| 1 | 1 |
<%= title l(:label_confirmation) %> |
| 2 | 2 | |
| 3 | 3 |
<%= form_tag(group_users_path(@group, :user_ids => @users.map(&:id)), method: :delete) do %> |
| 4 |
<%= hidden_field_tag :back_url, (@back || users_path) %> |
|
| 4 | 5 |
<div class="warning"> |
| 5 | 6 |
<p><%= simple_format l :text_users_remove_from_group_confirmation, group: "<strong>#{@group.name}</strong>".html_safe %></p>
|
| 6 | ||
| 7 |
|
|
| 7 | 8 |
<% @users.each do |user| %> |
| 8 | 9 |
<p><strong><%= user.name %></strong> (<%= user.login %>)</p> |
| 9 | 10 |
<% end %> |
| ... | ... | |
| 15 | 16 | |
| 16 | 17 |
<p> |
| 17 | 18 |
<%= submit_tag l(:button_delete) %> |
| 18 |
<%= link_to l(:button_cancel), @back_url || users_path %>
|
|
| 19 |
<%= link_to l(:button_cancel), @back || users_path %> |
|
| 19 | 20 |
</p> |
| 20 | 21 |
<% end %> |