Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

resolution bug

This commit is contained in:
afornerot 2021-04-02 14:36:13 +02:00
parent ccdacac7c5
commit f621ebea82
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/ItemRepository.php
View File

@ -48,14 +48,13 @@ class ItemRepository extends EntityRepository
->setParameter("itemcategory",$itemcategoryfilter); ->setParameter("itemcategory",$itemcategoryfilter);
} }
if($fgessential) {
$qb->andWhere("item.essential=:flag")
->setParameter("flag",true);
}
$itemsroles=$qb->getQuery()->getResult(); $itemsroles=$qb->getQuery()->getResult();
foreach($itemsroles as $itemrole) { 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); if(!$itemalls->contains($itemrole)) $itemalls->add($itemrole);
} }
} }
@ -74,14 +73,13 @@ class ItemRepository extends EntityRepository
->setParameter("itemcategory",$itemcategoryfilter); ->setParameter("itemcategory",$itemcategoryfilter);
} }
if($fgessential) {
$qb->andWhere("item.essential=:flag")
->setParameter("flag",true);
}
$itemsgroups=$qb->getQuery()->getResult(); $itemsgroups=$qb->getQuery()->getResult();
foreach($itemsgroups as $itemgroup) { 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); if(!$itemalls->contains($itemgroup)) $itemalls->add($itemgroup);
} }
@ -103,14 +101,13 @@ class ItemRepository extends EntityRepository
->setParameter("itemcategory",$itemcategoryfilter); ->setParameter("itemcategory",$itemcategoryfilter);
} }
if($fgessential) {
$qb->andWhere("item.essential=:flag")
->setParameter("flag",true);
}
$itemsniveau01s=$qb->getQuery()->getResult(); $itemsniveau01s=$qb->getQuery()->getResult();
foreach($itemsniveau01s as $itemniveau01) { 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); if(!$itemalls->contains($itemniveau01)) $itemalls->add($itemniveau01);
} }
} }
@ -129,14 +126,13 @@ class ItemRepository extends EntityRepository
->setParameter("itemcategory",$itemcategoryfilter); ->setParameter("itemcategory",$itemcategoryfilter);
} }
if($fgessential) {
$qb->andWhere("item.essential=:flag")
->setParameter("flag",true);
}
$itemsssoitems=$qb->getQuery()->getResult(); $itemsssoitems=$qb->getQuery()->getResult();
foreach($itemsssoitems as $itemssoitem) { 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); if(!$itemalls->contains($itemssoitem)) $itemalls->add($itemssoitem);
} }
} }