Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2020-10-27 09:05:42 +01:00
commit b648137665
2 changed files with 4 additions and 2 deletions

View File

@ -581,7 +581,6 @@ class PagewidgetController extends Controller
case "itemcategory":
$iditemcategory=$parameter["value"];
if($iditemcategory) $itemcategoryfilter=$this->em->getRepository("CadolesPortalBundle:Itemcategory")->findBy(["id"=>$iditemcategory]);
break;
case "search":

View File

@ -19,6 +19,9 @@ class ItemRepository extends EntityRepository
$bookmarks=$this->getEntityManager()->getRepository("CadolesPortalBundle:Bookmark")->findBy(["user"=>$user]);
$itemcategoryfilter=null;
if($iditemcategory) $itemcategoryfilter=$this->getEntityManager()->getRepository("CadolesPortalBundle:Itemcategory")->findBy(["id"=>$iditemcategory]);
// Bookmark lié à un item
$bookmarksitems=new ArrayCollection();
if($withbookmark==0) {