From 0a2063ce69a9fe3d66e62ccc2ec0924a38b91653 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 17 Oct 2019 10:10:49 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B02060:=20Fix=20data-localizer=20and=20arc?= =?UTF-8?q?hive=20mode=20initialization=20for=20Symfony=20portal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/config/services.yaml | 6 ++- ...plicationContextSetPluginPropertyClass.php | 52 +++++++++++++++++++ .../vendor/composer/autoload_classmap.php | 1 + .../vendor/composer/autoload_static.php | 1 + 4 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 datamodels/2.x/itop-portal-base/portal/src/EventListener/ApplicationContextSetPluginPropertyClass.php diff --git a/datamodels/2.x/itop-portal-base/portal/config/services.yaml b/datamodels/2.x/itop-portal-base/portal/config/services.yaml index bac52bdd1b..92d23ad250 100644 --- a/datamodels/2.x/itop-portal-base/portal/config/services.yaml +++ b/datamodels/2.x/itop-portal-base/portal/config/services.yaml @@ -67,11 +67,13 @@ services: # Tag services without defining them (see https://symfony.com/doc/current/service_container/tags.html#autoconfiguring-tags) _instanceof: Combodo\iTop\Portal\EventListener\UserProvider: - tags: [{ name: 'kernel.event_listener', event: 'kernel.request' }] + tags: [{ name: 'kernel.event_listener', event: 'kernel.request', priority: 500 }] calls: - [setContainer, ['@service_container']] Combodo\iTop\Portal\EventListener\ApplicationContextSetUrlMakerClass: - tags: [{ name: 'kernel.event_listener', event: 'kernel.request' }] + tags: [{ name: 'kernel.event_listener', event: 'kernel.request', priority: 400 }] + Combodo\iTop\Portal\EventListener\ApplicationContextSetPluginPropertyClass: + tags: [{ name: 'kernel.event_listener', event: 'kernel.request', priority: 300 }] # Add more service definitions when explicit configuration is needed # Please note that last definitions always *replace* previous ones diff --git a/datamodels/2.x/itop-portal-base/portal/src/EventListener/ApplicationContextSetPluginPropertyClass.php b/datamodels/2.x/itop-portal-base/portal/src/EventListener/ApplicationContextSetPluginPropertyClass.php new file mode 100644 index 0000000000..f3b4290b3e --- /dev/null +++ b/datamodels/2.x/itop-portal-base/portal/src/EventListener/ApplicationContextSetPluginPropertyClass.php @@ -0,0 +1,52 @@ + + */ +class ApplicationContextSetPluginPropertyClass +{ + /** + * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $oGetResponseEvent + */ + public function onKernelRequest(GetResponseEvent $oGetResponseEvent) + { + // Enable archived data + utils::InitArchiveMode(); + + // Enabling datalocalizer if needed + if (!defined('DISABLE_DATA_LOCALIZER_PORTAL')) + { + ApplicationContext::SetPluginProperty('QueryLocalizerPlugin', 'language_code', UserRights::GetUserLanguage()); + } + } +} \ No newline at end of file diff --git a/datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_classmap.php b/datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_classmap.php index 0a6148450d..0bca33db6b 100644 --- a/datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_classmap.php +++ b/datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_classmap.php @@ -31,6 +31,7 @@ return array( 'Combodo\\iTop\\Portal\\DependencyInjection\\SilexCompatBootstrap\\PortalXmlConfiguration\\Forms' => $baseDir . '/src/DependencyInjection/SilexCompatBootstrap/PortalXmlConfiguration/Forms.php', 'Combodo\\iTop\\Portal\\DependencyInjection\\SilexCompatBootstrap\\PortalXmlConfiguration\\Lists' => $baseDir . '/src/DependencyInjection/SilexCompatBootstrap/PortalXmlConfiguration/Lists.php', 'Combodo\\iTop\\Portal\\EventListener\\ApplicationContextSetUrlMakerClass' => $baseDir . '/src/EventListener/ApplicationContextSetUrlMakerClass.php', + 'Combodo\\iTop\\Portal\\EventListener\\ApplicationContextSetPluginPropertyClass' => $baseDir . '/src/EventListener/ApplicationContextSetPluginPropertyClass.php', 'Combodo\\iTop\\Portal\\EventListener\\UserProvider' => $baseDir . '/src/EventListener/UserProvider.php', 'Combodo\\iTop\\Portal\\Form\\ObjectFormManager' => $baseDir . '/src/Form/ObjectFormManager.php', 'Combodo\\iTop\\Portal\\Form\\PasswordFormManager' => $baseDir . '/src/Form/PasswordFormManager.php', diff --git a/datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_static.php b/datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_static.php index 79163bd9fc..9c2d68bc08 100644 --- a/datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_static.php +++ b/datamodels/2.x/itop-portal-base/portal/vendor/composer/autoload_static.php @@ -51,6 +51,7 @@ class ComposerStaticInitdf408f3f8ea034d298269cdf7647358b 'Combodo\\iTop\\Portal\\DependencyInjection\\SilexCompatBootstrap\\PortalXmlConfiguration\\Forms' => __DIR__ . '/../..' . '/src/DependencyInjection/SilexCompatBootstrap/PortalXmlConfiguration/Forms.php', 'Combodo\\iTop\\Portal\\DependencyInjection\\SilexCompatBootstrap\\PortalXmlConfiguration\\Lists' => __DIR__ . '/../..' . '/src/DependencyInjection/SilexCompatBootstrap/PortalXmlConfiguration/Lists.php', 'Combodo\\iTop\\Portal\\EventListener\\ApplicationContextSetUrlMakerClass' => __DIR__ . '/../..' . '/src/EventListener/ApplicationContextSetUrlMakerClass.php', + 'Combodo\\iTop\\Portal\\EventListener\\ApplicationContextSetPluginPropertyClass' => __DIR__ . '/../..' . '/src/EventListener/ApplicationContextSetPluginPropertyClass.php', 'Combodo\\iTop\\Portal\\EventListener\\UserProvider' => __DIR__ . '/../..' . '/src/EventListener/UserProvider.php', 'Combodo\\iTop\\Portal\\Form\\ObjectFormManager' => __DIR__ . '/../..' . '/src/Form/ObjectFormManager.php', 'Combodo\\iTop\\Portal\\Form\\PasswordFormManager' => __DIR__ . '/../..' . '/src/Form/PasswordFormManager.php',