From ac82424b6b1631f6b224d171a97d48d57be842b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Thu, 31 Oct 2024 06:56:35 +0100 Subject: [PATCH 1/1] Remove guestid and guestgroup in favour of more reliable defaultgroup Cleanup --- Repository/UserRepository.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php index ec5ffa3..85dad14 100644 --- a/Repository/UserRepository.php +++ b/Repository/UserRepository.php @@ -76,8 +76,8 @@ FROM ( u.mail, u.forename, u.surname, - IFNULL(g.id, :guestid) AS g_id, - IFNULL(g.title, :guesttitle) AS g_title + IFNULL(g.id, 0) AS g_id, + IFNULL(g.title, :defaultgroup) AS g_title FROM RapsysUserBundle:User AS u LEFT JOIN RapsysUserBundle:UserGroup AS gu ON (gu.user_id = u.id) LEFT JOIN RapsysUserBundle:Group AS g ON (g.id = gu.group_id) @@ -103,7 +103,6 @@ SQL; ->addScalarResult('mail', 'mail', 'string') ->addScalarResult('forename', 'forename', 'string') ->addScalarResult('surname', 'surname', 'string') - ->addScalarResult('g_id', 'g_id', 'integer') ->addScalarResult('g_title', 'g_title', 'string'); //Fetch result -- 2.41.1