src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php

@@ -638,7 +638,7 @@ class PagewidgetController extends Controller
             }
         
             // Profilage
-            $itemsordered = $this->em->getRepository("CadolesPortalBundle:Item")->getUserItems($this->user,$bookmarks,$items,$itemcategorys,null,0,true);
+            $itemsordered = $this->em->getRepository("CadolesPortalBundle:Item")->getUserItems($this->user,$bookmarks,$items,$itemcategorys,null,true,true);
         }
 
         // Render

src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/ItemRepository.php

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

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig

@@ -709,7 +709,7 @@
         html+='<div class="grid-gutter-sizer"></div>';
         files.forEach(function(file) {
             url="{{ path('cadoles_core_'~access~'_file_download',{'directory':'calendarevent-xxxx','filename':'yyyy' }) }}";
-            url=url.replace("xxxx",$("#mymodal-event-mod #event_id").val());
+            url=url.replace("xxxx",event.id);
             url=url.replace("yyyy",file.name);
 
             html+='<div class="grid-item grid-small">';

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig

@@ -11,7 +11,8 @@
 {% set stylewidgetheader = constants.mystylewidgetheader(entity) %}
 {% set stylewidgetbody = constants.mystylewidgetbody(entity) %}
 
-{%if mini %}
+{% if canupdate or alerts|length>0 %}
+    {%if mini %}
         <div class="widget widget-mini widget-projalertect" data-id="{{ entity.id }}" loc="{{ entity.loc }}">
             <div class="widgetheader">
                 <a style="cursor:pointer" onClick="bigWidget({{entity.id}})">
@@ -23,9 +24,9 @@
                 </a>
             </div>
         </div>    
-{% else %}
-    {% if canupdate or alerts|length>0 %}
+    {% else %}
         <div class="widget {%if entity.border %} widget-bordered {%else%} widget-notbordered {%endif%} widget-alert" data-id="{{ entity.id }}" loc="{{ entity.loc }}" style="{{ stylewidget }}" height="{{ entity.height }}px">
+
             <div class="widgetmenu">
                 {% if canupdate %}
                 <i class="fa fa-trash fa-fw" title="Supprimer le Widget" onClick="delWidget({{ entity.id }})" style="{{ stylewidgetmenu }}"></i>