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

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source
This commit is contained in:
Benjamin Dalsass
2025-01-13 15:01:55 +01:00
parent 6539687f16 ec6adee9c1
commit 3fe8b6c696
19 changed files with 136 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-portal-base/portal/src/Brick/UserProfileBrick.php
View File

@@ -63,6 +63,8 @@ class UserProfileBrick extends PortalBrick
parent::RegisterTemplates($oTemplatesRegister);
$oTemplatesRegister->RegisterTemplates(self::class,
TemplateDefinitionDto::Create('page', static::TEMPLATES_BASE_PATH . 'user-profile/layout.html.twig'),
TemplateDefinitionDto::Create('user_info', static::TEMPLATES_BASE_PATH.'user-profile/user_info.html.twig'),
TemplateDefinitionDto::Create('user_info_ready_js', static::TEMPLATES_BASE_PATH.'user-profile/user_info.ready.js.twig'),
);
}

4
datamodels/2.x/itop-portal-base/portal/src/Controller/AbstractController.php
View File

@@ -45,6 +45,10 @@ abstract class AbstractController extends SymfonyAbstractController implements T
$oTemplatesRegister->RegisterTemplates(self::class,
TemplateDefinitionDto::Create('page', static::TEMPLATES_BASE_PATH . 'layout.html.twig'),
TemplateDefinitionDto::Create('modal', static::TEMPLATES_BASE_PATH . 'modal/layout.html.twig'),
TemplateDefinitionDto::Create('loader', static::TEMPLATES_BASE_PATH.'helpers/loader.html.twig'),
TemplateDefinitionDto::Create('tagset_clic_handler_js', static::TEMPLATES_BASE_PATH.'helpers/tagset_clic_handler.js.twig'),
TemplateDefinitionDto::Create('session_message', static::TEMPLATES_BASE_PATH.'helpers/session_messages/session_message.html.twig'),
TemplateDefinitionDto::Create('session_messages', static::TEMPLATES_BASE_PATH.'helpers/session_messages/session_messages.html.twig'),
);
}

8
datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php
View File

@@ -84,7 +84,13 @@ class ObjectController extends BrickController
TemplateDefinitionDto::Create('page', static::TEMPLATES_BASE_PATH. 'bricks/object/layout.html.twig'),
TemplateDefinitionDto::Create('modal', static::TEMPLATES_BASE_PATH. 'bricks/object/modal.html.twig'),
TemplateDefinitionDto::Create('mode_create', static::TEMPLATES_BASE_PATH.'bricks/object/mode_create.html.twig', true, 'create'),
TemplateDefinitionDto::Create('mode_loader', static::TEMPLATES_BASE_PATH.'modal/mode_loader.html.twig', true, 'loader'),
TemplateDefinitionDto::Create('mode_edit', static::TEMPLATES_BASE_PATH.'bricks/object/mode_edit.html.twig', true, 'edit'),
TemplateDefinitionDto::Create('mode_search_hierarchy', static::TEMPLATES_BASE_PATH.'bricks/object/mode_search_hierarchy.html.twig', true, 'search_hierarchy'),
TemplateDefinitionDto::Create('mode_search_regular', static::TEMPLATES_BASE_PATH.'bricks/object/mode_search_regular.html.twig', true, 'search_regular'),
TemplateDefinitionDto::Create('mode_view', static::TEMPLATES_BASE_PATH.'bricks/object/mode_view.html.twig', true, 'view'),
TemplateDefinitionDto::Create('mode_apply_stimulus', static::TEMPLATES_BASE_PATH.'bricks/object/mode_apply_stimulus.html.twig', true, 'apply_stimulus'),
TemplateDefinitionDto::Create('mode_loader', static::TEMPLATES_BASE_PATH.'modal/mode_loader.html.twig'),
TemplateDefinitionDto::Create('plugins_buttons', static::TEMPLATES_BASE_PATH.'bricks/object/plugins_buttons.html.twig'),
);
}

8
datamodels/2.x/itop-portal-base/portal/src/Helper/ApplicationHelper.php
View File

@@ -100,9 +100,9 @@ class ApplicationHelper
try
{
// Allowed profiles
if ($oBrick->GetAllowedProfilesOql() !== null && $oBrick->GetAllowedProfilesOql() !== '')
if (utils::IsNotNullOrEmptyString($oBrick->GetAllowedProfilesOql()))
{
$oSearch = DBObjectSearch::FromOQL($oBrick->GetAllowedProfilesOql());
$oSearch = DBObjectSearch::FromOQL_AllData($oBrick->GetAllowedProfilesOql());
$oSet = new DBObjectSet($oSearch);
while ($oProfile = $oSet->Fetch())
{
@@ -111,9 +111,9 @@ class ApplicationHelper
}
// Denied profiles
if ($oBrick->GetDeniedProfilesOql() !== null && $oBrick->GetDeniedProfilesOql() !== '')
if (utils::IsNotNullOrEmptyString($oBrick->GetDeniedProfilesOql()))
{
$oSearch = DBObjectSearch::FromOQL($oBrick->GetDeniedProfilesOql());
$oSearch = DBObjectSearch::FromOQL_AllData($oBrick->GetDeniedProfilesOql());
$oSet = new DBObjectSet($oSearch);
while ($oProfile = $oSet->Fetch())
{

1
datamodels/2.x/itop-portal-base/portal/src/Service/TemplatesProvider/TemplatesProviderService.php
View File

@@ -180,6 +180,7 @@ class TemplatesProviderService
*
* @return string|null
* @throws \ReflectionException
* @throws \Exception
*/
public function GetTemplatePath(string $sProviderClass, string $sTemplateId, bool $bIsInitial = false): ?string
{

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

@@ -4,7 +4,7 @@
{% block pPageReadyScripts %}
{{ parent() }}
{% include 'itop-portal-base/portal/templates/helpers/tagset_clic_handler.js.twig' %}
{% include template('tagset_clic_handler_js') %}
{% endblock %}

2
datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig
View File

@@ -19,7 +19,7 @@
<div id="brick_mosaic_overlay">
{% block bBrowseMosaicOverlay %}
<div class="overlay_content">
{% include 'itop-portal-base/portal/templates/helpers/loader.html.twig' %}
{% include template('loader') %}
</div>
{% endblock %}
</div>

2
datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig
View File

@@ -34,7 +34,7 @@
</div>
<div id="brick_tree_overlay">
<div class="overlay_content">
{% include 'itop-portal-base/portal/templates/helpers/loader.html.twig' %}
{% include template('loader') %}
</div>
</div>
{% endblock %}

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

@@ -18,5 +18,5 @@
{% block pPageReadyScripts %}
{{ parent() }}
{% include 'itop-portal-base/portal/templates/helpers/tagset_clic_handler.js.twig' %}
{% include template('tagset_clic_handler_js') %}
{% endblock %}

2
datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_create.html.twig
View File

@@ -30,7 +30,7 @@
{# Misc. buttons #}
{% if form.buttons is defined and (form.buttons.actions is defined or form.buttons.links is defined) %}
<div class="form_btn_misc">
{% include 'itop-portal-base/portal/templates/bricks/object/plugins_buttons.html.twig' with {'aButtons': form.buttons} %}
{% include template('plugins_buttons', 'Combodo\\iTop\\Portal\\Controller\\ObjectController') with {'aButtons': form.buttons} %}
</div>
{% endif %}
{# Transition buttons #}

2
datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_view.html.twig
View File

@@ -6,7 +6,7 @@
{# Misc. buttons #}
{% if form.buttons is defined and (form.buttons.actions is defined or form.buttons.links is defined) %}
<div class="form_btn_misc">
{% include 'itop-portal-base/portal/templates/bricks/object/plugins_buttons.html.twig' with {'aButtons': form.buttons} %}
{% include template('plugins_buttons', 'Combodo\\iTop\\Portal\\Controller\\ObjectController') with {'aButtons': form.buttons} %}
</div>
{% endif %}

4
datamodels/2.x/itop-portal-base/portal/templates/bricks/user-profile/layout.html.twig
View File

@@ -55,7 +55,7 @@
{% set oContactForm = forms.contact %}
{% set oPreferencesForm = forms.preferences %}
{% set oPasswordForm = forms.password %}
{% include 'itop-portal-base/portal/templates/bricks/user-profile/user_info.html.twig' %}
{% include template('user_info', 'Combodo\\iTop\\Portal\\Brick\\UserProfileBrick') %}
{% else %}
<div id="user-profile-wrapper">
<div class="row">
@@ -80,7 +80,7 @@
{% set oContactForm = forms.contact %}
{% set oPreferencesForm = forms.preferences %}
{% set oPasswordForm = forms.password %}
{% include 'itop-portal-base/portal/templates/bricks/user-profile/user_info.ready.js.twig' %}
{% include template('user_info_ready_js', 'Combodo\\iTop\\Portal\\Brick\\UserProfileBrick') %}
{% endif %}
{% endblock %}

2
datamodels/2.x/itop-portal-base/portal/templates/helpers/session_messages/session_messages.html.twig
View File

@@ -1,5 +1,5 @@
<div id="session-messages">
{% for aSessionMessage in app['session_message_helper'] %}
{% include 'itop-portal-base/portal/templates/helpers/session_messages/session_message.html.twig' with {aSessionMessage: aSessionMessage} %}
{% include template('session_message') with {aSessionMessage: aSessionMessage} %}
{% endfor %}
</div>

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

@@ -11,7 +11,7 @@
<div class="col-xs-12 col-sm-9 col-md-10 col-sm-offset-3 col-md-offset-2">
<section class="row">
<div class="col-xs-12">
{% include 'itop-portal-base/portal/templates/helpers/session_messages/session_messages.html.twig' %}
{% include template('session_messages') %}
</div>
</section>
<section class="row tiles_wrapper">

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

@@ -335,7 +335,7 @@
<div class="col-xs-12 col-sm-9 col-md-10 col-sm-offset-3 col-md-offset-2">
<section class="row">
<div class="col-xs-12">
{% include 'itop-portal-base/portal/templates/helpers/session_messages/session_messages.html.twig' %}
{% include template('session_messages') %}
</div>
</section>
<section class="row" id="main-header">
@@ -367,7 +367,7 @@
<div class="modal fade" id="modal-for-all" role="dialog" tabindex="-1">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
{% include 'itop-portal-base/portal/templates/helpers/loader.html.twig' %}
{% include template('loader') %}
</div>
</div>
</div>
@@ -395,7 +395,7 @@
{% block pPageOverlay %}
<div id="page_overlay" class="global_overlay">
<div class="overlay_content">
{% include 'itop-portal-base/portal/templates/helpers/loader.html.twig' %}
{% include template('loader') %}
</div>
</div>
{% endblock %}

2
datamodels/2.x/itop-portal-base/portal/templates/modal/mode_loader.html.twig
View File

@@ -3,7 +3,7 @@
{% extends 'itop-portal-base/portal/templates/modal/layout.html.twig' %}
{% block pModalContent %}
{% include 'itop-portal-base/portal/templates/helpers/loader.html.twig' %}
{% include template('loader') %}
{% if redirection is defined and redirection.url is defined %}
<script type="text/javascript">