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

Fix name of files : in order to manage the use of "&" character in url

Browse Source
This commit is contained in:
acognet
2021-01-27 11:13:52 +01:00
parent ef1b7ca82c
commit c98881671b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,8 @@
{% for sJsFile in aPage.aJsFiles %} {% for sJsFile in aPage.aJsFiles %}
if (! $.inArray('{{ sJsFile|raw }}',aListJsFiles)) if (! $.inArray('{{ sJsFile|raw }}',aListJsFiles))
{ {
aFilesToLoad{{ sId }}.push('{{ sJsFile|add_itop_version }}'); aFilesToLoad{{ sId }}.push('{{ sJsFile|raw|add_itop_version }}');
aListJsFiles.push("{{ sJsFile }}"); aListJsFiles.push("{{ sJsFile|raw }}");
} }
{% endfor %} {% endfor %}
var iCurrentIdx{{ sId }} = 0; var iCurrentIdx{{ sId }} = 0;

6
templates/pages/backoffice/webpage/layout.html.twig
View File

@@ -12,7 +12,7 @@
{% endif %} {% endif %}
<title>{{ aPage.sTitle }}</title> <title>{{ aPage.sTitle }}</title>
{% if aPage.sFaviconUrl is defined %} {% if aPage.sFaviconUrl is defined %}
<link rel="shortcut icon" href="{{ aPage.sFaviconUrl|add_itop_version }}"> <link rel="shortcut icon" href="{{ aPage.sFaviconUrl|raw|add_itop_version }}">
{% endif %} {% endif %}
<link rel="search" type="application/opensearchdescription+xml" title="iTop" href="{{ aPage.sAbsoluteUrlAppRoot }}pages/opensearch.xml.php"> <link rel="search" type="application/opensearchdescription+xml" title="iTop" href="{{ aPage.sAbsoluteUrlAppRoot }}pages/opensearch.xml.php">
@@ -22,7 +22,7 @@
{% block iboPageCssFiles %} {% block iboPageCssFiles %}
{% for aCssFileData in aPage.aCssFiles %} {% for aCssFileData in aPage.aCssFiles %}
{% if aCssFileData['condition'] != '' %}<!--[if {{ aCssFileData['condition'] }}]>{% endif %} {% if aCssFileData['condition'] != '' %}<!--[if {{ aCssFileData['condition'] }}]>{% endif %}
<link type="text/css" href="{{ aCssFileData['link']|add_itop_version }}" rel="stylesheet"> <link type="text/css" href="{{ aCssFileData['link']|raw|add_itop_version }}" rel="stylesheet">
{% if aCssFileData['condition'] != '' %}<![endif]-->{% endif %} {% if aCssFileData['condition'] != '' %}<![endif]-->{% endif %}
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}
@@ -62,7 +62,7 @@
</script> </script>
{% block iboPageJsFiles %} {% block iboPageJsFiles %}
{% for sJsFile in aPage.aJsFiles %} {% for sJsFile in aPage.aJsFiles %}
<script type="text/javascript" src="{{ sJsFile|add_itop_version }}"></script> <script type="text/javascript" src="{{ sJsFile|raw|add_itop_version }}"></script>
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}