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

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

Browse Source 
# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig
#	datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig
This commit is contained in:
Pierre Goiffon
2022-02-22 09:40:37 +01:00
parent f9e8bf88c8 815870fe6b
commit 9ce88699ca
51 changed files with 768 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/ajax.render.php
View File

@@ -1060,7 +1060,7 @@ EOF
$iCol = utils::ReadParam("iCol");
$sDashletIdOrig = utils::ReadParam("dashletid");
$sFinalDashletId = Dashboard::GetDashletUniqueId($bIsCustomized, $sDashboardDivId, $iRow, $iCol, $sDashletIdOrig);
$oPage = new AjaxPage('');
$oPage = new DownloadPage('');
$oPage->add($sFinalDashletId);
break;