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":
|
||||
$iditemcategory=$parameter["value"];
|
||||
if($iditemcategory) $itemcategoryfilter=$this->em->getRepository("CadolesPortalBundle:Itemcategory")->findBy(["id"=>$iditemcategory]);
|
||||
break;
|
||||
|
||||
case "search":
|
||||
|
|
|
@ -18,7 +18,10 @@ class ItemRepository extends EntityRepository
|
|||
if($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
|
||||
$bookmarksitems=new ArrayCollection();
|
||||
if($withbookmark==0) {
|
||||
|
|
Loading…
Reference in New Issue