X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/b50edfff7f68b16418110a8ed17d6b514dc9d1c6..147361137a871795a8b0293d1c1e7927f9ba3567:/Repository/UserRepository.php

diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php
index ec5ffa3..6cb6cc3 100644
--- a/Repository/UserRepository.php
+++ b/Repository/UserRepository.php
@@ -32,7 +32,7 @@ class UserRepository extends Repository implements PasswordUpgraderInterface {
 		//Set the request
 		$req = <<<SQL
 SELECT COUNT(u.id) AS count
-FROM RapsysUserBundle:User AS u
+FROM Rapsys\UserBundle\Entity\User AS u
 SQL;
 
 		//Get result set mapping instance
@@ -76,11 +76,11 @@ FROM (
 		u.mail,
 		u.forename,
 		u.surname,
-		IFNULL(g.id, :guestid) AS g_id,
-		IFNULL(g.title, :guesttitle) 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)
+		g.id AS g_id,
+		g.title AS g_title
+	FROM Rapsys\UserBundle\Entity\User AS u
+	LEFT JOIN Rapsys\UserBundle\Entity\UserGroup AS gu ON (gu.user_id = u.id)
+	LEFT JOIN Rapsys\UserBundle\Entity\Group AS g ON (g.id = gu.group_id)
 	ORDER BY NULL
 	LIMIT 0, :limit
 ) AS t
@@ -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
@@ -119,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])) {