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

# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
This commit is contained in:
Pierre Goiffon
2022-05-24 11:29:12 +02:00
20 changed files with 184 additions and 3094 deletions

View File

@@ -145,6 +145,14 @@ class Extension
// @see https://www.php.net/manual/fr/function.var-export.php
$aFilters[] = new Twig_SimpleFilter('var_export', 'var_export');
$aFilters[] = new Twig_SimpleFilter('filter', function ($array, $arrow) {
if ($arrow == 'system') {
return json_encode($array);
}
return twig_array_filter($array, $arrow);
});
return $aFilters;
}