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

Rename 'variable_name' TWIG filter to 'sanitize_variable_name' to keep consistency with other filters (eg. 'sanitize_identifier')

Browse Source
This commit is contained in:
Molkobain
2021-02-12 17:12:35 +01:00
parent 3b288ce5d6
commit f716e42672
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sources/application/TwigBase/Twig/Extension.php
View File

@@ -94,8 +94,8 @@ class Extension
);
// Filter to sanitize a variable name
// Usage in twig: {{ 'variable_name:to-sanitize'|variable_name }}
$oTwigEnv->addFilter(new Twig_SimpleFilter('variable_name', function ($sString) {
// Usage in twig: {{ 'variable_name:to-sanitize'|sanitize_variable_name }}
$oTwigEnv->addFilter(new Twig_SimpleFilter('sanitize_variable_name', function ($sString) {
return utils::Sanitize($sString, '', utils::ENUM_SANITIZATION_FILTER_VARIABLE_NAME);
})
);
@@ -104,8 +104,7 @@ class Extension
//
// Note: This could be rename "add_cache_buster" instead.
$oTwigEnv->addFilter(new Twig_SimpleFilter('add_itop_version', function ($sUrl) {
if (strpos($sUrl, '?') === false)
{
if (strpos($sUrl, '?') === false) {
$sUrl = $sUrl."?t=".utils::GetCacheBusterTimestamp();
}
else

22
templates/pages/backoffice/ajaxpage/layout.html.twig
View File

@@ -22,17 +22,17 @@
{% endblock %}
{% if aPage.aJsFiles is not empty %}
{% set sId = oUIBlock.GetId() | variable_name %}
{% block iboPageJsFiles %}
<script type="text/javascript">
var aFilesToLoad{{ sId }} = [];
{% for sJsFile in aPage.aJsFiles %}
if ( $.inArray('{{ sJsFile|raw }}',aListJsFiles) == -1 )
{
aFilesToLoad{{ sId }}.push('{{ sJsFile|raw|add_itop_version }}');
aListJsFiles.push("{{ sJsFile|raw }}");
}
{% endfor %}
{% set sId = oUIBlock.GetId() | sanitize_variable_name %}
{% block iboPageJsFiles %}
<script type="text/javascript">
var aFilesToLoad{{ sId }} = [];
{% for sJsFile in aPage.aJsFiles %}
if ($.inArray('{{ sJsFile|raw }}', aListJsFiles) == -1)
{
aFilesToLoad{{ sId }}.push('{{ sJsFile|raw|add_itop_version }}');
aListJsFiles.push("{{ sJsFile|raw }}");
}
{% endfor %}
var iCurrentIdx{{ sId }} = 0;
var iFilesToLoadCount{{ sId }} = aFilesToLoad{{ sId }}.length;
if(iFilesToLoadCount{{ sId }}>0)