From 618982565e3957818d3a623784f20f0326379cbc Mon Sep 17 00:00:00 2001
From: FloWalchs <florian.walchshofer@icloud.com>
Date: Wed, 13 May 2026 20:55:39 +0000
Subject: [PATCH 3/3] 
 0004-Ensure-correct-redirect-after-user-removal-confirmation

---
 app/controllers/groups_controller.rb | 7 +++++--
 app/views/groups/remove_users.erb    | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index ef7cc99c0..9ca787cdc 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -117,7 +117,10 @@ class GroupsController < ApplicationController
     @users = User.not_in_group(@group).where(:id => (params[:user_id] || params[:user_ids])).to_a
     @group.users << @users
     respond_to do |format|
-      format.html {redirect_back_or_default edit_group_path(@group, :tab => 'users')}
+      format.html do
+        flash[:notice] = l(:notice_successful_update)
+        redirect_back_or_default edit_group_path(@group, :tab => 'users')
+      end
       format.js
       format.api do
         if @users.any?
@@ -131,7 +134,7 @@ class GroupsController < ApplicationController
 
   def remove_users
     @users = @group.users.where(:id => (params[:user_id] || params[:user_ids])).to_a
-
+    @back = back_url
     if @users.empty?
       render_404
       return
diff --git a/app/views/groups/remove_users.erb b/app/views/groups/remove_users.erb
index 3d1497681..d4c9b5205 100644
--- a/app/views/groups/remove_users.erb
+++ b/app/views/groups/remove_users.erb
@@ -1,9 +1,10 @@
 <%= title l(:label_confirmation) %>
 
 <%= form_tag(group_users_path(@group, :user_ids => @users.map(&:id)), method: :delete) do %>
+  <%= hidden_field_tag :back_url, (@back || users_path) %>
   <div class="warning">
     <p><%= simple_format l :text_users_remove_from_group_confirmation, group: "<strong>#{@group.name}</strong>".html_safe %></p>
-
+    
     <% @users.each do |user| %>
       <p><strong><%= user.name %></strong> (<%= user.login %>)</p>
     <% end %>
@@ -15,6 +16,6 @@
 
   <p>
     <%= submit_tag l(:button_delete) %>
-    <%= link_to l(:button_cancel), @back_url || users_path %>
+    <%= link_to l(:button_cancel), @back || users_path %>
   </p>
 <% end %>
-- 
2.43.0