Cadoles
/
ninegate
18
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2021-07-05 10:47:55 +02:00
parent de04ab9bdb 3e9e581116
commit f228f01c62
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php
View File

@ -46,6 +46,7 @@ class SondeController extends Controller
elseif($route=="cadoles_portal_user_page_view") { elseif($route=="cadoles_portal_user_page_view") {
if($usage=="group") $usagesonde="collaboratif"; if($usage=="group") $usagesonde="collaboratif";
elseif($usage=="user") $usagesonde="collaboratif"; elseif($usage=="user") $usagesonde="collaboratif";
elseif($usage=="accueil") $usagesonde="accueil";
else $usagesonde="portail"; else $usagesonde="portail";
} }
elseif(stripos($route,"cadoles_portal_user_calendar")!==false) elseif(stripos($route,"cadoles_portal_user_calendar")!==false)

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

@ -288,7 +288,12 @@
{% if entity.id is defined %} {% if entity.id is defined %}
{% for calendar in calendars %} {% for calendar in calendars %}
{% if calendar.id==entity.id %} {% 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 %} {% endif %}
{% endfor %} {% endfor %}
{% else %} {% else %}

9
src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
View File

@ -13,9 +13,12 @@
{% set forcereload=page.toreload %} {% set forcereload=page.toreload %}
{% endif %} {% endif %}
{% set usage="portal" %}
{% if loop.first %} {% set usage="accueil" %} {%endif %}
{% if entity.id is defined and page.id==entity.id %} {% if entity.id is defined and page.id==entity.id %}
<li id="menupage-{{page.id}}" class="active" style="cursor:pointer"> <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 %} {% if page.fonticon %}
<i class="{{ page.fonticon }} fa-faw"></i>&nbsp; <i class="{{ page.fonticon }} fa-faw"></i>&nbsp;
{% endif %} {% endif %}
@ -258,7 +261,9 @@
{% if gotoroute is empty %} {% if gotoroute is empty %}
{% for page in pagesadmin %} {% for page in pagesadmin %}
{% if page.id==entity.id %} {% 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 %} {% endif %}
{% endfor %} {% endfor %}