Merge branch 'master' into dist/envole/6/master
This commit is contained in:
commit
b648137665
|
@ -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":
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
Loading…
Reference in New Issue