Add fallback to root group for every primary_group_id case when redir…

…ecting
hitobito · Jan 2, 2025 · 82dd867 · 82dd867
1 parent 2c5ac89
commit 82dd867
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/controllers/sac_cas/groups/self_registration_controller.rb b/app/controllers/sac_cas/groups/self_registration_controller.rb
@@ -56,12 +56,12 @@ def redirect_to_login
 
   def redirect_to_memberships_tab
     flash[:notice] = t("groups.self_registration.create.existing_membership_notice")
-    redirect_to history_group_person_path(group_id: current_user.primary_group_id, id: current_user.id)
+    redirect_to history_group_person_path(group_id: current_user.primary_group_id || Group.root.id, id: current_user.id)
   end
 
   def redirect_to_person_show
     flash[:notice] = t("groups.self_registration.create.existing_family_notice")
-    redirect_to history_group_person_path(group_id: current_user.primary_group_id, id: current_user.id)
+    redirect_to history_group_person_path(group_id: current_user.primary_group_id || Group.root.id, id: current_user.id)
   end
 
   def redirect_to_group_if_necessary
@@ -70,7 +70,7 @@ def redirect_to_group_if_necessary
 
   def redirect_target
     if current_user.present?
-      history_group_person_path(group_id: current_user.reload.primary_group_id, id: current_user.id)
+      history_group_person_path(group_id: current_user.reload.primary_group_id || Group.root.id, id: current_user.id)
     else
       new_person_session_path
     end