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

Merge branch 'support/3.2' into develop

Browse Source
This commit is contained in:
odain
2025-11-07 20:33:14 +01:00
parent 6cf6e7dd8d 4a9a85458d
commit 7681c157ec
1837 changed files with 33034 additions and 34549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
datamodels/2.x/itop-portal-base/portal/config/bundles.php
View File

@@ -1,4 +1,5 @@
<?php
/**
* Copyright (C) 2013-2024 Combodo SAS
*

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

@@ -58,26 +58,25 @@ $oKPI->ComputeAndReport('Load portal lists definition');
// A dedicated listener 'CssFromSassCompiler' exists to compile files again when by-passing HTTP cache.
// This is to keep developers comfort when tuning the SCSS files.
$oKPI = new ExecutionKPI();
$aImportPaths = array($_ENV['COMBODO_PORTAL_BASE_ABSOLUTE_PATH'].'css/');
$aImportPaths = [$_ENV['COMBODO_PORTAL_BASE_ABSOLUTE_PATH'].'css/'];
$aPortalConf = $container->getParameter('combodo.portal.instance.conf');
foreach ($aPortalConf['properties']['themes'] as $sKey => $value)
{
if (!is_array($value))
{
$aPortalConf['properties']['themes'][$sKey] = utils::GetCSSFromSASS('env-'.utils::GetCurrentEnvironment().'/'.$value,
$aImportPaths);
}
else
{
$aValues = array();
foreach ($value as $sSubValue)
{
$aValues[] = utils::GetCSSFromSASS('env-'.utils::GetCurrentEnvironment().'/'.$sSubValue,
$aImportPaths);
foreach ($aPortalConf['properties']['themes'] as $sKey => $value) {
if (!is_array($value)) {
$aPortalConf['properties']['themes'][$sKey] = utils::GetCSSFromSASS(
'env-'.utils::GetCurrentEnvironment().'/'.$value,
$aImportPaths
);
} else {
$aValues = [];
foreach ($value as $sSubValue) {
$aValues[] = utils::GetCSSFromSASS(
'env-'.utils::GetCurrentEnvironment().'/'.$sSubValue,
$aImportPaths
);
}
$aPortalConf['properties']['themes'][$sKey] = $aValues;
}
}
$oKPI->ComputeAndReport('Generating CSS files');
$container->setParameter('combodo.portal.instance.conf', $aPortalConf);
$container->setParameter('combodo.portal.instance.conf', $aPortalConf);

6
datamodels/2.x/itop-portal-base/portal/config/routes/extensions_extra_routes.php
View File

@@ -1,4 +1,5 @@
<?php
/**
* Copyright (C) 2013-2024 Combodo SAS
*
@@ -24,8 +25,7 @@ use Symfony\Component\Routing\Route;
$oRouteCollection = new RouteCollection();
$aRoutes = ItopExtensionsExtraRoutes::GetRoutes();
foreach ($aRoutes as $aRoute)
{
foreach ($aRoutes as $aRoute) {
$aRoute['values'] = (isset($aRoute['values'])) ? $aRoute['values'] : [];
$aRoute['asserts'] = (isset($aRoute['asserts'])) ? $aRoute['asserts'] : [];
@@ -42,4 +42,4 @@ foreach ($aRoutes as $aRoute)
);
}
return $oRouteCollection;
return $oRouteCollection;

3
datamodels/2.x/itop-portal-base/portal/config/services.php
View File

@@ -1,4 +1,5 @@
<?php
/**
* Copyright (C) 2013-2024 Combodo SAS
*
@@ -45,4 +46,4 @@ return static function (ContainerConfigurator $oContainer) {
->autoconfigure();
}
};
};