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

Fix some strange behavior

Browse Source
This commit is contained in:
acognet
2023-08-10 12:24:01 +02:00
parent b852e72088
commit 49cf6f5fe2
9 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sources/Application/UI/Base/Component/Navigation/NavigationUIBlockFactory.php
View File

@@ -22,6 +22,7 @@ namespace Combodo\iTop\Application\UI\Base\Component\Navigation;
use Combodo\iTop\Application\UI\Base\AbstractUIBlockFactory;
use DBObjectSearch;
use DBObjectSet;
use utils;
/**
* Class PanelUIBlockFactory
@@ -48,19 +49,26 @@ class NavigationUIBlockFactory extends AbstractUIBlockFactory
*
* @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel
*/
public static function MakeStandard($oObject, string $sFilter, array $aList = [], string $sBackUrl = '', $sPostedFieldsForBackUrl = "")
public static function MakeStandard($oObject, string $sBasketFilter, string $sBasketClass, array $aList = [], string $sBackUrl = '', $sPostedFieldsForBackUrl = "")
{
if ($sFilter != null && count($aList) === 0) {
$oFilter = DBObjectSearch::FromOQL($sFilter);
$oSet = new DBObjectSet($oFilter);
if (utils::IsNotNullOrEmptyString($sBasketFilter) && count($aList) === 0) {
$oBasketFilter = DBObjectSearch::FromOQL($sBasketFilter);
$oSet = new DBObjectSet($oBasketFilter);
$aList = $oSet->GetColumnAsArray('id', false);
if (utils::IsNullOrEmptyString($sBasketClass)) {
$sBasketClass = $oBasketFilter->GetClass();
}
}
if (utils::IsNullOrEmptyString($sBasketClass)) {
$oBasketFilter = DBObjectSearch::FromOQL($sBasketFilter);
$sBasketClass = $oBasketFilter->GetClass();
}
if (count($aList) === 0) {
return null;
}
$iIdx = array_search($oObject->GetKey(), $aList);
$oNavigationBlock = new Navigation(get_class($oObject), $iIdx, $aList, $sFilter, $sBackUrl, $sPostedFieldsForBackUrl);
$oNavigationBlock = new Navigation($sBasketClass, $iIdx, $aList, $sBasketFilter, $sBackUrl, $sPostedFieldsForBackUrl);
return $oNavigationBlock;
}