composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-01 22:48:45 +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

12
application/cmdbabstract.class.inc.php
View File

@@ -624,11 +624,17 @@ HTML
if ($oAttDef instanceof AttributeDashboard) {
if (!$this->IsNew()) {
$sHostContainerInEditionUrlParam = ($bEditMode) ? '&host_container_in_edition=true' : '';
$oPage->AddAjaxTab($oAttDef->GetLabel(),
utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=dashboard&class='.get_class($this).'&id='.$this->GetKey().'&attcode='.$oAttDef->GetCode().$sHostContainerInEditionUrlParam,
$oPage->AddAjaxTab(
'Class:'.$sClass.'/Attribute:'.$sAttCode,
utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=dashboard&class='
.get_class($this)
.'&id='.$this->GetKey()
.'&attcode='.$oAttDef->GetCode()
.$sHostContainerInEditionUrlParam,
true,
'Class:'.$sClass.'/Attribute:'.$sAttCode,
AjaxTab::ENUM_TAB_PLACEHOLDER_DASHBOARD);
AjaxTab::ENUM_TAB_PLACEHOLDER_DASHBOARD
);
// Add graphs dependencies
WebResourcesHelper::EnableC3JSToWebPage($oPage);
}