From f621ebea822a6d96d75ede23494f58b2b405ac9e Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Fri, 2 Apr 2021 14:36:13 +0200
Subject: [PATCH] resolution bug

---
 .../Repository/ItemRepository.php             | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/ItemRepository.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/ItemRepository.php
index 9d4c8925..e686bd74 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/ItemRepository.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/ItemRepository.php
@@ -48,14 +48,13 @@ class ItemRepository extends EntityRepository
                    ->setParameter("itemcategory",$itemcategoryfilter);
             }
 
-            if($fgessential) {
-                $qb->andWhere("item.essential=:flag")
-                   ->setParameter("flag",true);                
-            }
-
             $itemsroles=$qb->getQuery()->getResult();
             foreach($itemsroles as $itemrole) {
-                if(!$bookmarksitems->contains($itemrole) && !$items->contains($itemrole)) $items->add($itemrole);
+                if(!$bookmarksitems->contains($itemrole) && !$items->contains($itemrole)) {
+                    if(!$fgessential || ($fgessential && $itemrole->getEssential()))
+                        $items->add($itemrole);
+                }
+
                 if(!$itemalls->contains($itemrole)) $itemalls->add($itemrole);
             }
         }
@@ -74,14 +73,13 @@ class ItemRepository extends EntityRepository
                    ->setParameter("itemcategory",$itemcategoryfilter);
             }
 
-            if($fgessential) {
-                $qb->andWhere("item.essential=:flag")
-                   ->setParameter("flag",true);                
-            }
-
             $itemsgroups=$qb->getQuery()->getResult();
             foreach($itemsgroups as $itemgroup) {
-                if(!$bookmarksitems->contains($itemgroup) && !$items->contains($itemgroup)) $items->add($itemgroup);
+                if(!$bookmarksitems->contains($itemgroup) && !$items->contains($itemgroup)) {
+                    if(!$fgessential || ($fgessential && $itemgroup->getEssential()))
+                        $items->add($itemgroup);
+                }
+
                 if(!$itemalls->contains($itemgroup)) $itemalls->add($itemgroup);
             }
 
@@ -103,14 +101,13 @@ class ItemRepository extends EntityRepository
                    ->setParameter("itemcategory",$itemcategoryfilter);
             }
 
-            if($fgessential) {
-                $qb->andWhere("item.essential=:flag")
-                   ->setParameter("flag",true);                
-            }
-
             $itemsniveau01s=$qb->getQuery()->getResult();
             foreach($itemsniveau01s as $itemniveau01) {
-                if(!$bookmarksitems->contains($itemniveau01) && !$items->contains($itemniveau01)) $items->add($itemniveau01);
+                if(!$bookmarksitems->contains($itemniveau01) && !$items->contains($itemniveau01)) {
+                    if(!$fgessential || ($fgessential && $itemniveau01->getEssential()))
+                        $items->add($itemniveau01);
+                }
+
                 if(!$itemalls->contains($itemniveau01)) $itemalls->add($itemniveau01);
             }
         }
@@ -129,14 +126,13 @@ class ItemRepository extends EntityRepository
                    ->setParameter("itemcategory",$itemcategoryfilter);
             }
 
-            if($fgessential) {
-                $qb->andWhere("item.essential=:flag")
-                   ->setParameter("flag",true);                
-            }
-
             $itemsssoitems=$qb->getQuery()->getResult();
             foreach($itemsssoitems as $itemssoitem) {
-                if(!$bookmarksitems->contains($itemssoitem) && !$items->contains($itemssoitem)) $items->add($itemssoitem);
+                if(!$bookmarksitems->contains($itemssoitem) && !$items->contains($itemssoitem)) {
+                    if(!$fgessential || ($fgessential && $itemssoitem->getEssential()))
+                        $items->add($itemssoitem);
+                }
+
                 if(!$itemalls->contains($itemssoitem)) $itemalls->add($itemssoitem);
             }
         }