From 1a77a16689da402450798a8ae1db92f43d911de8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sun, 3 Nov 2024 02:07:44 +0100 Subject: [PATCH] Remove defaultgroup Attribute user without group to the fake Null group --- Repository/UserRepository.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php index 85dad14..7f9d571 100644 --- a/Repository/UserRepository.php +++ b/Repository/UserRepository.php @@ -76,8 +76,8 @@ FROM ( u.mail, u.forename, u.surname, - IFNULL(g.id, 0) AS g_id, - IFNULL(g.title, :defaultgroup) AS g_title + g.id AS g_id, + g.title 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) @@ -118,7 +118,7 @@ SQL; //Process result foreach($res as $data) { //Get translated group - $group = $this->translator->trans($data['g_title'], [], $this->alias); + $group = $this->translator->trans($data['g_title']?:'Null', [], $this->alias); //Init group subarray if (!isset($ret[$group])) { -- 2.41.1