From 14283a731ef43c1731272a644e384942a2836fc6 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Wed, 30 Jun 2021 09:29:31 +0200
Subject: [PATCH 1/2] correctif sur admin calendar

---
 .../PortalBundle/Resources/views/Calendar/view.html.twig   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig
index d8823939..3347e3c4 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Calendar/view.html.twig
@@ -288,7 +288,12 @@
         {% if entity.id is defined %}
             {% for calendar in calendars %} 
                 {% if calendar.id==entity.id %}
-                    showCalendar({{ calendar.id }}, {{ calendar.canadd }});
+                    {% if access=="config" %}
+                        {% set calendarcanadd=true %}
+                    {% else %}
+                        {% set calendarcanadd=calendar.canadd %}
+                    {% endif %}
+                    showCalendar({{ calendar.id }}, {{ calendarcanadd }});
                 {% endif %}
             {% endfor %}
         {% else %}

From 3e9e581116d0e50ab29be4099d47431766b16e70 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Mon, 5 Jul 2021 10:44:59 +0200
Subject: [PATCH 2/2] prise en compte des usage dnma accueil

---
 .../Cadoles/CoreBundle/Controller/SondeController.php    | 1 +
 .../PortalBundle/Resources/views/Page/pages.html.twig    | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php
index 176e34c1..c6705ea5 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php
@@ -46,6 +46,7 @@ class SondeController extends Controller
         elseif($route=="cadoles_portal_user_page_view") {
             if($usage=="group") $usagesonde="collaboratif";
             elseif($usage=="user")  $usagesonde="collaboratif";
+            elseif($usage=="accueil")  $usagesonde="accueil";
             else $usagesonde="portail";
         }
         elseif(stripos($route,"cadoles_portal_user_calendar")!==false)
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
index c2d5e1e6..aec3a6f3 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
@@ -13,9 +13,12 @@
                 {% set forcereload=page.toreload %}
             {% endif %}
 
+            {% set usage="portal" %}
+            {% if loop.first %} {% set usage="accueil" %} {%endif %}
+
             {% if entity.id is defined and page.id==entity.id %}
                 <li id="menupage-{{page.id}}" class="active" style="cursor:pointer">
-                    <a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','portal','{{forcereload}}',null,'{{page.name}}')">
+                    <a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','{{usage}}','{{forcereload}}',null,'{{page.name}}')">
                         {% if page.fonticon %}
                             <i class="{{ page.fonticon }} fa-faw"></i>&nbsp;
                         {% endif %}                    
@@ -258,7 +261,9 @@
         {% if gotoroute is empty %}
             {% for page in pagesadmin %} 
                 {% if page.id==entity.id %}
-                    showPage({{ page.id }}, {{ page.pagecategory.id }},'{{ page.canupdate }}','portal',false,null,'{{page.name}}');
+                    {% set usage="portal" %}
+                    {% if loop.first %} {% set usage="accueil" %} {%endif %}                
+                    showPage({{ page.id }}, {{ page.pagecategory.id }},'{{ page.canupdate }}','{{usage}}',false,null,'{{page.name}}');
                 {% endif %}
             {% endfor %}