From 39c469fd45ab542464012073081c2624a8011d84 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Fri, 10 Jul 2020 12:21:42 +0200
Subject: [PATCH] afficher tt item si vu item only

---
 .../Resources/public/themes/transnum/look.png | Bin 27748 -> 27748 bytes
 .../public/themes/transnum/transnum-logo.png  | Bin 27748 -> 27748 bytes
 .../Resources/views/Config/datauser.html.twig |   2 +-
 .../Resources/views/User/list.html.twig       |   2 +-
 .../Controller/PagewidgetController.php       |  21 +++++++++++++++---
 5 files changed, 20 insertions(+), 5 deletions(-)

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 e7872ab33e5c3d315c8b5002df06660e19d03956..26c736ac50d373642a8d2328269c01b60d088947 100644
GIT binary patch
delta 24
gcmaEIgYn4?#tm0ZIoY|`)im;Ve3IUL&$P`90Er?BS^xk5

delta 24
gcmaEIgYn4?#tm0ZIoTw*SozLuQ7zbf&$P`90EY((5C8xG

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 e7872ab33e5c3d315c8b5002df06660e19d03956..26c736ac50d373642a8d2328269c01b60d088947 100644
GIT binary patch
delta 24
gcmaEIgYn4?#tm0ZIoY|`)im;Ve3IUL&$P`90Er?BS^xk5

delta 24
gcmaEIgYn4?#tm0ZIoTw*SozLuQ7zbf&$P`90EY((5C8xG

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/datauser.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/datauser.html.twig
index d2bee48f..41cedf87 100755
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/datauser.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/datauser.html.twig
@@ -6,7 +6,7 @@
         {% if mode=="datauser" %}
             Paramétrage de la Fiche Utilisateur
         {% else %}
-            Paramétrage de la Listes des Utilisateurs
+            Paramétrage de la Liste des Utilisateurs
         {% endif %}
     </h1>
 
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig
index a462021b..17dff5e9 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig
@@ -33,7 +33,7 @@ td { font-size: 10px; }
                         <th class="no-sort">Action</th>
                         {% endif %}
                         <th class="no-sort {% if fields["avatar"] is defined and fields["avatar"].perm==0 %}no-visible{% endif %}">Avatar</th>
-                        <th class=="{% if fields["login"] is defined and fields["login"].perm==0 %}no-visible{% endif %}">Login</th>
+                        <th class="{% if fields["login"] is defined and fields["login"].perm==0 and access!="config"%}no-visible{% endif %}">Login</th>
                         <th class="{% if fields["lastname"] is defined and fields["lastname"].perm==0 %}no-visible{% endif %}">Nom</th>
                         <th class="{% if fields["firstname"] is defined and fields["firstname"].perm==0 %}no-visible{% endif %}">Prénom</th>
                         <th class="{% if fields["email"] is defined and fields["email"].perm==0 %}no-visible{% endif %}">Email</th>
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
index b4857153..e94e3132 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
@@ -523,7 +523,12 @@ class PagewidgetController extends Controller
             }
             $itemsroles=$qb->getQuery()->getResult();
             foreach($itemsroles as $itemrole) {
-                if(!$bookmarksitems->contains($itemrole) && !$items->contains($itemrole)) $items->add($itemrole);
+                if($withbookmark==1) {
+                    if(!$items->contains($itemrole)) $items->add($itemrole);
+                }
+                else {
+                    if(!$bookmarksitems->contains($itemrole) && !$items->contains($itemrole)) $items->add($itemrole);
+                }
             }
         }
 
@@ -541,7 +546,12 @@ class PagewidgetController extends Controller
             }
             $itemsgroups=$qb->getQuery()->getResult();
             foreach($itemsgroups as $itemgroup) {
-                if(!$bookmarksitems->contains($itemgroup) && !$items->contains($itemgroup)) $items->add($itemgroup);
+                if($withbookmark==1) {
+                    if(!$items->contains($itemgroup)) $items->add($itemgroup);
+                }
+                else {
+                    if(!$bookmarksitems->contains($itemgroup) && !$items->contains($itemgroup)) $items->add($itemgroup);
+                }
             }
         }
 
@@ -559,7 +569,12 @@ class PagewidgetController extends Controller
             }
             $itemsniveau01s=$qb->getQuery()->getResult();
             foreach($itemsniveau01s as $itemniveau01) {
-                if(!$bookmarksitems->contains($itemniveau01) && !$items->contains($itemniveau01)) $items->add($itemniveau01);
+                if($withbookmark==1) {
+                    if(!$items->contains($itemniveau01)) $items->add($itemniveau01);
+                }
+                else {
+                    if(!$bookmarksitems->contains($itemniveau01) && !$items->contains($itemniveau01)) $items->add($itemniveau01);
+                }
             }
         }