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

N°1386 - Advanced Search: Navigation in list - Browse this list - back from run_query

Browse Source
This commit is contained in:
acognet
2023-05-25 16:07:15 +02:00
parent 9ebcbf2459
commit b852e72088
15 changed files with 132 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sources/Application/UI/Base/Component/Navigation/Navigation.php
View File

@@ -53,6 +53,7 @@ class Navigation extends UIContentBlock
protected $sFilter;
protected $sBackUrl;
protected $sClass;
protected $sPostedFields;
/**
* Panel constructor.
@@ -62,7 +63,7 @@ class Navigation extends UIContentBlock
* @param string $sColorScheme Color scheme code such as "success", "failure", "active", ... {@see css/backoffice/components/_panel.scss}
* @param string|null $sId
*/
public function __construct(string $sClass, int $iIdx, array $aList, string $sFilter, string $sBackUrl, ?string $sId = null)
public function __construct(string $sClass, int $iIdx, array $aList, string $sFilter, string $sBackUrl, string $sPostedFieldsForBackUrl = "", ?string $sId = null)
{
parent::__construct($sId);
$this->iCount = count($aList);
@@ -82,6 +83,7 @@ class Navigation extends UIContentBlock
$this->iIdNext = $aList[$iIdx + 1];
$this->iIdLast = $aList[$this->iCount - 1];
}
$this->sPostedFields = $sPostedFieldsForBackUrl;
}
/**
@@ -89,7 +91,15 @@ class Navigation extends UIContentBlock
*/
public function GetIdx(): int
{
return $this->iIdx+1;
return $this->iIdx + 1;
}
/**
* @return string
*/
public function GetPostedFields(): string
{
return $this->sPostedFields;
}
/**

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

@@ -48,7 +48,7 @@ class NavigationUIBlockFactory extends AbstractUIBlockFactory
*
* @return \Combodo\iTop\Application\UI\Base\Component\Panel\Panel
*/
public static function MakeStandard($oObject, string $sFilter, array $aList = [], string $sBackUrl = '')
public static function MakeStandard($oObject, string $sFilter, array $aList = [], string $sBackUrl = '', $sPostedFieldsForBackUrl = "")
{
if ($sFilter != null && count($aList) === 0) {
$oFilter = DBObjectSearch::FromOQL($sFilter);
@@ -60,7 +60,7 @@ class NavigationUIBlockFactory extends AbstractUIBlockFactory
}
$iIdx = array_search($oObject->GetKey(), $aList);
$oNavigationBlock = new Navigation(get_class($oObject), $iIdx, $aList, $sFilter, $sBackUrl);
$oNavigationBlock = new Navigation(get_class($oObject), $iIdx, $aList, $sFilter, $sBackUrl, $sPostedFieldsForBackUrl);
return $oNavigationBlock;
}