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 - new version

Browse Source
This commit is contained in:
acognet
2023-05-22 13:40:46 +02:00
parent d4e64bc479
commit f4545615cb
12 changed files with 141 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,7 @@ class Navigation extends UIContentBlock
protected $iIdLast = 0;
protected $aList = [];
protected $sFilter;
protected $sBackUrl;
protected $sClass;
/**
@@ -61,16 +62,17 @@ 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 $sId = null)
public function __construct(string $sClass, int $iIdx, array $aList, string $sFilter, string $sBackUrl, ?string $sId = null)
{
parent::__construct($sId);
$this->iCount = count($aList);
if ( $this->iCount == 0) {
if ($this->iCount == 0) {
return new UIContentBlock();
}
$this->sClass = $sClass;
$this->aList = $aList;
$this->sFilter = $sFilter;
$this->sBackUrl = $sBackUrl;
$this->iIdx = $iIdx;
if ($this->iIdx>0) {
$this->iIdFirst = $aList[0];
@@ -100,39 +102,56 @@ class Navigation extends UIContentBlock
private function GetUrlFromId($iId)
{
$sUrl = iTopStandardURLMaker::MakeObjectURL($this->sClass, $iId).'&filter='.urlencode($this->sFilter);
$sUrl = iTopStandardURLMaker::MakeObjectURL($this->sClass, $iId);
return $sUrl;
}
/**
* @return int|mixed
* @return string
*/
public function GetUrlFirst()
public function GetUrlFirst(): string
{
return $this->GetUrlFromId( $this->iIdFirst);
return $this->GetUrlFromId($this->iIdFirst);
}
/**
* @return string
*/
public function GetUrlPrev(): string
{
return $this->GetUrlFromId($this->iIdPrev);
}
/**
* @return string
*/
public function GetUrlNext(): string
{
return $this->GetUrlFromId($this->iIdNext);
}
/**
* @return int|mixed
*/
public function GetUrlPrev()
public function GetUrlLast(): string
{
return $this->GetUrlFromId( $this->iIdPrev);
return $this->GetUrlFromId($this->iIdLast);
}
/**
* @return int|mixed
* @return string
*/
public function GetUrlNext()
public function GetBackUrl(): string
{
return $this->GetUrlFromId( $this->iIdNext);
return $this->sBackUrl;
}
/**
* @return int|mixed
* @return string
*/
public function GetUrlLast()
public function GetFilter(): string
{
return $this->GetUrlFromId( $this->iIdLast);
return $this->sFilter;
}
/**
@@ -143,11 +162,6 @@ class Navigation extends UIContentBlock
return json_encode($this->aList);
}
public function GetUrlSearch(){
$sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot();
return "{$sAbsoluteUrl}pages/UI.php?operation=search&filter=".urlencode(urlencode('["'.$this->sFilter.'",[],[]]'));
}
/**
* @return bool
*/

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

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