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

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

Browse Source 
# Conflicts:
#	templates/pages/backoffice/webpage/layout.html.twig
This commit is contained in:
Molkobain
2023-03-07 22:10:47 +01:00
parent 19db527bf7 176e373d6c
commit ec643d1975
3 changed files with 115 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/dataTables.settings.js
View File

@@ -89,11 +89,11 @@ $(function () {
aOptions = $.extend(aOptions, JSON.parse(data));
if (aOptions.js_files) {
$.each(aOptions.js_files, function (i, item) {
if ($.inArray(item, aListJsFiles) === -1)
if ($.inArray(item, aLoadedJsFilesRegister) === -1)
{
sFileUrl = CombodoGlobalToolbox.AddParameterToUrl(item, aOptions.js_files_param, aOptions.js_files_value);
$.ajax({url:sFileUrl, dataType: 'script', cache: true });
aListJsFiles.push(item);
aLoadedJsFilesRegister.push(item);
}
});
}