diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php index a8550d94..193a8d4e 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -428,6 +428,7 @@ class PagewidgetController extends Controller // Récupération des paramétres du widget $modedesktop=0; $iditemcategory=null; + $withbookmark=true; $search=false; $menu=false; $menuall=true; @@ -1974,17 +1975,19 @@ class PagewidgetController extends Controller $mygroups=[]; $this->getDoctrine()->getRepository("CadolesPortalBundle:Page")->getPagesUser($user,null,$default,$pagesuser,$pagesadmin,$groupsshared); - foreach($groupsshared as $groupshared) { + if(is_array($groupsshared)) { + foreach($groupsshared as $groupshared) { - $title=$groupshared->getLabel(); - $idpage=$groupshared->pagesshared[0]->getId(); - $icon=null; - if($groupshared->getIcon()) - $icon="/".$groupshared->getIcon()->getLabel(); + $title=$groupshared->getLabel(); + $idpage=$groupshared->pagesshared[0]->getId(); + $icon=null; + if($groupshared->getIcon()) + $icon="/".$groupshared->getIcon()->getLabel(); - array_push($mygroups,["title"=>$title,"icon"=>$icon,"id"=>$idpage]); + array_push($mygroups,["title"=>$title,"icon"=>$icon,"id"=>$idpage]); + } } - + // Render return $this->render($this->labelentity.':viewgroup.html.twig', [ 'entity' => $entity, diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig index c1d2eb6a..73c977ac 100755 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig @@ -56,6 +56,7 @@