composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-08 02:24:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°7122 N°4164 - Adjustment to Symfony 5.4

Browse Source
This commit is contained in:
Molkobain
2024-03-11 21:57:37 +01:00
parent 3e6e096f62
commit b08b5297cf
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
datamodels/2.x/itop-portal-base/portal/src/EventListener/UserProvider.php
View File

@@ -47,6 +47,8 @@ class UserProvider implements ContainerAwareInterface
private $oContainer;
/** @var \User $oUser */
private $oUser;
/** @var bool $bUserCanLogOff Whether the current user can log off or not */
private $bUserCanLogOff;
/** @var array $aAllowedPortals */
private $aAllowedPortals;
@@ -93,7 +95,7 @@ class UserProvider implements ContainerAwareInterface
}
// User allowed to log off or not
$this->oContainer->set('combodo.current_user.can_logoff', utils::CanLogOff());
$this->bUserCanLogOff = utils::CanLogOff();
// Allowed portals
$aAllowedPortals = UserRights::GetAllowedPortals();
@@ -125,6 +127,15 @@ class UserProvider implements ContainerAwareInterface
return $this->oUser;
}
/**
* @return bool {@see static::$bUserCanLogOff}
* @since 3.1.2 3.2.0
*/
public function getCurrentUserCanLogOff(): bool
{
return $this->bUserCanLogOff;
}
/**
* Get allowed portals.
*

9
datamodels/2.x/itop-portal-base/portal/src/Twig/CurrentUserAccessor.php
View File

@@ -61,4 +61,13 @@ class CurrentUserAccessor
{
return $this->userProvider->getCurrentUser()->Get($key);
}
/**
* @return bool
* @since 3.1.2 3.2.0
*/
public function CanLogOff(): bool
{
return $this->userProvider->getCurrentUserCanLogOff();
}
}

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

@@ -3,7 +3,7 @@
{% if app['combodo.current_user'] is defined and app['combodo.current_user'] is not null %}
{% set bUserConnected = true %}
{% set bUserCanLogOff = app['combodo.current_user.can_logoff'] %}
{% set bUserCanLogOff = app['combodo.current_user'].CanLogOff() %}
{% set sUserFullname = app['combodo.current_user'].Get('first_name') ~ ' ' ~ app['combodo.current_user'].Get('last_name') %}
{% set sUserEmail = app['combodo.current_user'].Get('email') %}
{% set sUserPhotoUrl = app['combodo.current_contact.photo_url'] %}
@@ -129,15 +129,13 @@
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/ckeditor/adapters/jquery.js'|add_itop_version }}"></script>
{# - Hilighter for code snippets created with CKEditor #}
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/ckeditor/plugins/codesnippet/lib/highlight/highlight.pack.js'|add_itop_version }}"></script>
{# - Custom settings #}
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/ckeditor.on-init.js'|add_itop_version }}"></script>
{# Date-time picker for Bootstrap #}
<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'lib/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js'|add_itop_version }}"></script>
{# Typeahead files for autocomplete #}
<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'lib/typeahead/js/typeahead.bundle.min.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'lib/handlebars/js/handlebars.min-768ddbd.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/leave_handler.js'|add_itop_version }}"></script>
<script type="text/javascript" src="{{ app['combodo.portal.base.absolute_url'] ~ 'js/portal_leave_handler.js'|add_itop_version }}"></script>
{# Selectize for sets #}
<script type="text/javascript" src="{{ app['combodo.absolute_url'] ~ 'js/selectize.js'|add_itop_version }}"></script>
@@ -545,12 +543,7 @@
});
// Initialize confirmation message handler when a form with touched fields is closed
oBodyElem.leave_handler({
'message': '{{ 'Portal:Form:Close:Warning'|dict_s }}',
'extra_events': {
'body': ['hide.bs.modal']
}
});
oBodyElem.portal_leave_handler({'message': '{{ 'Portal:Form:Close:Warning'|dict_s }}'});
{% endblock %}
});
</script>