From 228993dbd6f9272df23e8e1dfee492f876ee3ccf Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 8 Jun 2020 09:01:52 +0200 Subject: [PATCH] =?UTF-8?q?filtre=20de=20recherche=20sur=20le=20nom=20du?= =?UTF-8?q?=20propri=C3=A9taire=20(ref=20#147)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreBundle/Controller/GroupController.php | 8 ++++++-- .../Resources/public/themes/transnum/look.png | Bin 27748 -> 27748 bytes .../public/themes/transnum/transnum-logo.png | Bin 27748 -> 27748 bytes 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php index 2176e20e..de1d446f 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php @@ -82,7 +82,9 @@ class GroupController extends Controller $qb=$em->createQueryBuilder(); $qb->select('COUNT(table)') ->from($this->labelentity,'table') + ->leftJoin('CadolesCoreBundle:User', 'u', 'WITH', 'table.owner = u.id') ->where('table.label LIKE :value') + ->orWhere('u.username LIKE :value') ->setParameter("value", "%".$search["value"]."%"); if($access=="user") { $qb->from("CadolesCoreBundle:UserGroup","ug") @@ -107,19 +109,21 @@ class GroupController extends Controller // Parcours des Enregistrement $qb = $em->createQueryBuilder(); - $qb->select('table')->from($this->labelentity,'table'); + $qb ->select('table') + ->from($this->labelentity,'table') + ->leftJoin('CadolesCoreBundle:User', 'u', 'WITH', 'table.owner = u.id'); if($access=="user") { $qb->from("CadolesCoreBundle:UserGroup","ug") ->andWhere(("table.fgcanshare=:flag")) ->andWhere("table.id=ug.group") ->andWhere(":user=ug.user") - ->leftJoin('CadolesCoreBundle:User', 'u', 'WITH', 'table.owner = u.id') ->setParameter("flag", true) ->setParameter("user", $this->getUser()); } if($search["value"]!="") { $qb ->andwhere('table.label LIKE :value') + ->orWhere('u.username LIKE :value') ->setParameter("value", "%".$search["value"]."%"); } switch($order[0]["column"]) { diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png index 8bcffd031afa1a650c7fdfbbb734622a929742c2..aecff8038c7a39cf461b549526afa3123923e8f8 100644 GIT binary patch delta 23 fcmaEIgYn4?#tqj@Iiz`2t>bU9d2POD+GYj-fO-kg delta 23 fcmaEIgYn4?#tqj@Irw>1<@YR93f_Frw9O0vfkg@O diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png index 8bcffd031afa1a650c7fdfbbb734622a929742c2..aecff8038c7a39cf461b549526afa3123923e8f8 100644 GIT binary patch delta 23 fcmaEIgYn4?#tqj@Iiz`2t>bU9d2POD+GYj-fO-kg delta 23 fcmaEIgYn4?#tqj@Irw>1<@YR93f_Frw9O0vfkg@O