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

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

Browse Source
This commit is contained in:
bdalsass
2025-07-01 16:11:20 +02:00
parent 278ac66637 14791bf6b4
commit d2d422afcf
16 changed files with 105 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/Application/UI/Base/Component/DataTable/DataTable.php
View File

@@ -99,7 +99,7 @@ class DataTable extends UIContentBlock
{
$oAppContext = new ApplicationContext();
if(strpos ($sAjaxUrl,'?')) {
$this->sAjaxUrl = $sAjaxUrl."&".$oAppContext->GetForLink();
$this->sAjaxUrl = $sAjaxUrl.$oAppContext->GetForLink(true);
} else {
$this->sAjaxUrl = $sAjaxUrl."?".$oAppContext->GetForLink();
}

4
sources/Application/UI/Links/Set/BlockLinkSetDisplayAsProperty.php
View File

@@ -97,7 +97,7 @@ class BlockLinkSetDisplayAsProperty extends UIContentBlock
$this->oTwigEnv = TwigHelper::GetTwigEnvironment(TwigHelper::ENUM_TEMPLATES_BASE_PATH_BACKOFFICE);
$oAppContext = new ApplicationContext();
$this->sAppContext = $oAppContext->GetForLink();
$this->sAppContext = $oAppContext->GetForLink(true);
$this->sUIPage = cmdbAbstractObject::ComputeStandardUIPage($this->sTargetClass);
}
@@ -160,7 +160,7 @@ class BlockLinkSetDisplayAsProperty extends UIContentBlock
{
return ' href="'
.utils::GetAbsoluteUrlAppRoot()
."pages/$this->sUIPage?operation=details&class=$this->sTargetClass&id=$id&$this->sAppContext"
."pages/$this->sUIPage?operation=details&class=$this->sTargetClass&id=$id$this->sAppContext"
.'" target="_self"';
}
}