composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2060 - WIP: Fix cached part of the portal (sync. commit)

Browse Source
This commit is contained in:
Molkobain
2020-01-15 12:53:08 +01:00
parent c3cc1afec1
commit 57100dee9f
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php
View File

@@ -72,6 +72,7 @@ $container->setParameter('combodo.portal.instance.conf', $aPortalConf);
//TODO: The following needs to be refactored //TODO: The following needs to be refactored
// Session messages // Session messages
// Note: We keep this system instead of following the Symfony system to make it simpler for extension developers to use them accross the admin. console and the portal.
$aAllMessages = array(); $aAllMessages = array();
if ((array_key_exists('obj_messages', $_SESSION)) && (!empty($_SESSION['obj_messages']))) if ((array_key_exists('obj_messages', $_SESSION)) && (!empty($_SESSION['obj_messages'])))
{ {
@@ -81,7 +82,7 @@ if ((array_key_exists('obj_messages', $_SESSION)) && (!empty($_SESSION['obj_mess
$aRanks = array(); $aRanks = array();
foreach ($aMessageObjectData as $sMessageId => $aMessageData) foreach ($aMessageObjectData as $sMessageId => $aMessageData)
{ {
$sMsgClass = 'alert alert-'; $sMsgClass = 'alert alert-dismissible alert-';
switch ($aMessageData['severity']) switch ($aMessageData['severity'])
{ {
case 'info': case 'info':
@@ -95,10 +96,10 @@ if ((array_key_exists('obj_messages', $_SESSION)) && (!empty($_SESSION['obj_mess
$sMsgClass .= 'success'; $sMsgClass .= 'success';
break; break;
} }
$aObjectMessages[] = array('cssClass' => $sMsgClass, 'message' => $aMessageData['message']); $aObjectMessages[] = array('css_classes' => $sMsgClass, 'message' => $aMessageData['message']);
$aRanks[] = $aMessageData['rank']; $aRanks[] = $aMessageData['rank'];
} }
unset($_SESSION['obj_messages'][$sMessageKey]); //unset($_SESSION['obj_messages'][$sMessageKey]);
array_multisort($aRanks, $aObjectMessages); array_multisort($aRanks, $aObjectMessages);
foreach ($aObjectMessages as $aObjectMessage) foreach ($aObjectMessages as $aObjectMessage)
{ {

7
datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig
View File

@@ -329,8 +329,11 @@
{% if app['combodo.current_user.session_messages']|length > 0 %} {% if app['combodo.current_user.session_messages']|length > 0 %}
<section class="row" id="session-messages"> <section class="row" id="session-messages">
<div class="col-xs-12"> <div class="col-xs-12">
{% for sessionMessage in app['combodo.current_user.session_messages'] %} {% for aSessionMessage in app['combodo.current_user.session_messages'] %}
<div class="{{ sessionMessage['cssClass'] }}">{{ sessionMessage['message'] }}</div> <div class="{{ aSessionMessage['css_classes'] }}">
<button type="button" class="close" data-dismiss="alert" aria-label="X"><span class="fas fa-times"></span></button>
{{ aSessionMessage['message'] }}
</div>
{% endfor %} {% endfor %}
</div> </div>
</section> </section>