From 75f4751b82d97acb4e958c654915c11a8fcfab00 Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Tue, 22 Nov 2022 10:25:42 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B05741=20-=20remove=20use=20of=20get=5Fcon?= =?UTF-8?q?fig=5Fparameter=20in=20Twig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/twigextension.class.inc.php | 9 --------- .../2.x/itop-portal-base/portal/config/bootstrap.php | 1 + .../2.x/itop-portal-base/portal/config/services.yaml | 1 + .../portal/src/Twig/AppExtension.php | 12 +----------- .../portal/templates/layout.html.twig | 4 ++-- sources/application/TwigBase/Twig/Extension.php | 9 --------- 6 files changed, 5 insertions(+), 31 deletions(-) diff --git a/application/twigextension.class.inc.php b/application/twigextension.class.inc.php index 52d1dd569..03885172c 100644 --- a/application/twigextension.class.inc.php +++ b/application/twigextension.class.inc.php @@ -5,7 +5,6 @@ namespace Combodo\iTop; use AttributeDateTime; use Dict; use Exception; -use MetaModel; use Twig_Environment; use Twig_SimpleFilter; use Twig_SimpleFunction; @@ -115,14 +114,6 @@ class TwigExtension return utils::IsDevelopmentEnvironment(); })); - // Function to get configuration parameter - // Usage in twig: {{ get_config_parameter('foo') }} - $oTwigEnv->addFunction(new Twig_SimpleFunction('get_config_parameter', function($sParamName) - { - $oConfig = MetaModel::GetConfig(); - return $oConfig->Get($sParamName); - })); - // Function to get the URL of a static page in a module // Usage in twig: {{ get_static_page_module_url('itop-my-module', 'path-to-my-page') }} $oTwigEnv->addFunction(new Twig_SimpleFunction('get_static_page_module_url', function($sModuleName, $sPage) diff --git a/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php b/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php index fe6381bdc..18150907a 100644 --- a/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php +++ b/datamodels/2.x/itop-portal-base/portal/config/bootstrap.php @@ -157,6 +157,7 @@ if (!defined('PORTAL_ID')) // Env. vars to be used in templates and others $_ENV['COMBODO_CURRENT_ENVIRONMENT'] = utils::GetCurrentEnvironment(); $_ENV['COMBODO_ABSOLUTE_URL'] = utils::GetAbsoluteUrlAppRoot(); +$_ENV['COMBODO_CONF_APP_ICON_URL'] = MetaModel::GetConfig()->Get('app_icon_url'); $_ENV['COMBODO_MODULES_ABSOLUTE_URL'] = utils::GetAbsoluteUrlModulesRoot(); $_ENV['COMBODO_PORTAL_BASE_ABSOLUTE_URL'] = utils::GetAbsoluteUrlModulesRoot().'itop-portal-base/portal/public/'; $_ENV['COMBODO_PORTAL_BASE_ABSOLUTE_PATH'] = MODULESROOT.'/itop-portal-base/portal/public/'; 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 0bdf3c740..1d0046e78 100644 --- a/datamodels/2.x/itop-portal-base/portal/config/services.yaml +++ b/datamodels/2.x/itop-portal-base/portal/config/services.yaml @@ -30,6 +30,7 @@ parameters: # Used in templates combodo.current_environment: '%env(string:COMBODO_CURRENT_ENVIRONMENT)%' combodo.absolute_url: '%env(string:COMBODO_ABSOLUTE_URL)%' + combodo.conf.app_icon_url: '%env(string:COMBODO_CONF_APP_ICON_URL)%' combodo.modules.absolute_url: '%env(string:COMBODO_MODULES_ABSOLUTE_URL)%' combodo.modules.absolute_path: !php/const MODULESROOT combodo.portal.base.absolute_url: '%env(string:COMBODO_PORTAL_BASE_ABSOLUTE_URL)%' diff --git a/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php b/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php index 88ad56440..b44f62e86 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php @@ -19,13 +19,11 @@ namespace Combodo\iTop\Portal\Twig; +use Dict; use Twig\Extension\AbstractExtension; - use Twig_SimpleFilter; use Twig_SimpleFunction; use utils; -use Dict; -use MetaModel; /** * Class AppExtension @@ -124,14 +122,6 @@ class AppExtension extends AbstractExtension return utils::IsDevelopmentEnvironment(); }); - // Function to get configuration parameter - // Usage in twig: {{ get_config_parameter('foo') }} - $functions[] = new Twig_SimpleFunction('get_config_parameter', function ($sParamName) { - $oConfig = MetaModel::GetConfig(); - - return $oConfig->Get($sParamName); - }); - return $functions; } diff --git a/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig index 19bd07512..681a1eaf0 100644 --- a/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig @@ -186,7 +186,7 @@ {% block pNavigationTopMenuLogo %} - + {% if app['combodo.portal.instance.conf'].properties.logo is not null %} {{ app['combodo.portal.instance.conf'].properties.name|dict_s }} {% else %} @@ -314,7 +314,7 @@ {% if app['kernel'].debug == true %}
Debug : Taille
{% endif %} - + {{ app['combodo.portal.instance.conf'].properties.name|dict_s }} {% endblock %} diff --git a/sources/application/TwigBase/Twig/Extension.php b/sources/application/TwigBase/Twig/Extension.php index 8a57714c5..dc82a6860 100644 --- a/sources/application/TwigBase/Twig/Extension.php +++ b/sources/application/TwigBase/Twig/Extension.php @@ -10,7 +10,6 @@ namespace Combodo\iTop\Application\TwigBase\Twig; use AttributeDateTime; use Dict; use Exception; -use MetaModel; use Twig_Environment; use Twig_SimpleFilter; use Twig_SimpleFunction; @@ -119,14 +118,6 @@ class Extension $oTwigEnv->addFunction(new Twig_SimpleFunction('is_development_environment', function () { return utils::IsDevelopmentEnvironment(); })); - - // Function to get configuration parameter - // Usage in twig: {{ get_config_parameter('foo') }} - $oTwigEnv->addFunction(new Twig_SimpleFunction('get_config_parameter', function ($sParamName) { - $oConfig = MetaModel::GetConfig(); - - return $oConfig->Get($sParamName); - })); } }