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

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

This commit is contained in:
Arnaud Fornerot 2020-10-27 09:05:42 +01:00
parent cd4472ee71 6d00b6c547
commit b648137665
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
View File

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

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

@ -19,6 +19,9 @@ class ItemRepository extends EntityRepository
$bookmarks=$this->getEntityManager()->getRepository("CadolesPortalBundle:Bookmark")->findBy(["user"=>$user]); $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 // Bookmark lié à un item
$bookmarksitems=new ArrayCollection(); $bookmarksitems=new ArrayCollection();
if($withbookmark==0) { if($withbookmark==0) {