composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +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

5
pages/UI.php
View File

@@ -437,7 +437,8 @@ try
//N°1386 - Advanced Search: Navigation in list - Browse this list
$sBackUrl = utils::ReadPostedParam('back_url', '', false, 'raw');
$sFilter = utils::ReadPostedParam('filter', null, false, 'raw');
$sBasketClass = utils::ReadPostedParam('basket_class', null, false, 'raw');
$sBasketFilter = utils::ReadPostedParam('basket_filter', null, false, 'raw');
$sList = utils::ReadPostedParam('list_navigation', null, false, 'string');
$sPostedFieldsForBackUrl = utils::ReadPostedParam('back_posted_fields', "", false, 'raw');
$aList = [];
@@ -447,7 +448,7 @@ try
$sClassLabel = MetaModel::GetName($sClass);
$oP->set_title(Dict::Format('UI:DetailsPageTitle', $oObj->GetRawName(), $sClassLabel)); // Set title will take care of the encoding
$oP->SetContentLayout(PageContentFactory::MakeForObjectDetails($oObj, $oP->IsPrintableVersion() ? cmdbAbstractObject::ENUM_DISPLAY_MODE_PRINT : cmdbAbstractObject::ENUM_DISPLAY_MODE_VIEW, $sFilter, $aList, $sBackUrl, $sPostedFieldsForBackUrl));
$oP->SetContentLayout(PageContentFactory::MakeForObjectDetails($oObj, $oP->IsPrintableVersion() ? cmdbAbstractObject::ENUM_DISPLAY_MODE_PRINT : cmdbAbstractObject::ENUM_DISPLAY_MODE_VIEW, $sBasketFilter, $sBasketClass, $aList, $sBackUrl, $sPostedFieldsForBackUrl));
$oObj->DisplayDetails($oP);
}
}

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

@@ -48,7 +48,7 @@ class DataTable extends UIContentBlock
protected $aAjaxData;
protected $aDisplayColumns;
protected $aResultColumns;
protected $sFilter;
protected $sBasketFilter;
/**
* @var string
*/
@@ -225,17 +225,17 @@ class DataTable extends UIContentBlock
/**
* @return string
*/
public function GetFilter()
public function GetBasketFilter()
{
return $this->sFilter;
return $this->sBasketFilter;
}
/**
* @param string $sFilter
*/
public function setFilter($sFilter): void
public function setBasketFilter($sFilter): void
{
$this->sFilter = $sFilter;
$this->sBasketFilter = $sFilter;
}
/**

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

@@ -596,7 +596,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
$oDataTable->SetDisplayColumns($aColumnDefinition);
$oDataTable->SetResultColumns($oCustomSettings->aColumns);
$oFilter->SetSelectedClasses([$sBasketAliasClass]);
$oDataTable->SetFilter($oFilter->ToOQL(true));
$oDataTable->SetBasketFilter($oFilter->ToOQL(true));
$oDataTable->SetInitDisplayData(AjaxRenderController::GetDataForTable($oSet, $aClassAliases, $aColumnsToLoad, $sIdName, $aExtraParams, 1, $sLinkToBasket));
// row actions

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

@@ -50,9 +50,9 @@ class Navigation extends UIContentBlock
protected $iIdNext = 0;
protected $iIdLast = 0;
protected $aList = [];
protected $sFilter;
protected $sBasketFilter;
protected $sBackUrl;
protected $sClass;
protected $sBasketClass;
protected $sPostedFields;
/**
@@ -63,16 +63,16 @@ 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 $sPostedFieldsForBackUrl = "", ?string $sId = null)
public function __construct(string $sBasketClass, int $iIdx, array $aList, string $sBasketFilter, string $sBackUrl, string $sPostedFieldsForBackUrl = "", ?string $sId = null)
{
parent::__construct($sId);
$this->iCount = count($aList);
if ($this->iCount == 0) {
return new UIContentBlock();
}
$this->sClass = $sClass;
$this->sBasketClass = $sBasketClass;
$this->aList = $aList;
$this->sFilter = $sFilter;
$this->sBasketFilter = $sBasketFilter;
$this->sBackUrl = $sBackUrl;
$this->iIdx = $iIdx;
if ($this->iIdx>0) {
@@ -112,7 +112,7 @@ class Navigation extends UIContentBlock
private function GetUrlFromId($iId)
{
$sUrl = iTopStandardURLMaker::MakeObjectURL($this->sClass, $iId);
$sUrl = iTopStandardURLMaker::MakeObjectURL($this->sBasketClass, $iId);
return $sUrl;
}
@@ -159,9 +159,9 @@ class Navigation extends UIContentBlock
/**
* @return string
*/
public function GetFilter(): string
public function GetBasketFilter(): string
{
return $this->sFilter;
return $this->sBasketFilter;
}
/**

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;
}

2
sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php
View File

@@ -120,8 +120,6 @@ class BlockIndirectLinkSetViewTable extends AbstractBlockLinkSetViewTable
$sAttributeLinkedSetIndirectAttCode = $oAttributeLinkedSetIndirectDefinition->GetCode();
$sAttributeLinkedSetIndirectLinkedClass = $oAttributeLinkedSetIndirectDefinition->GetTargetClass();
\IssueLog::Error('AttributeLinkedSetIndirectAttCode:'.$sAttributeLinkedSetIndirectAttCode);
\IssueLog::Error('AttributeLinkedSetIndirectLinkedClass:'.$sAttributeLinkedSetIndirectLinkedClass);
$aAttCodesToDisplay = MetaModel::GetAttributeLinkedSetIndirectDatatableAttCodesToDisplay($this->sObjectClass, $this->sAttCode, $sAttributeLinkedSetIndirectLinkedClass, $sAttributeLinkedSetIndirectAttCode);
/** @noinspection PhpUnnecessaryLocalVariableInspection */

5
templates/base/components/datatable/layout.ready.js.twig
View File

@@ -465,7 +465,10 @@ $('#datatable_dlg_{{ oUIBlock.GetId() }}').DataTableSettings(aOptions{{ sListIDF
$('body').append($('<form/>')
.attr({'method': 'post', 'id': 'basket{{ oUIBlock.GetId() }}'})
.append($('<input/>')
.attr({'type': 'hidden', 'name': 'filter', 'value': "{{ oUIBlock.GetFilter()|raw }}"})
.attr({'type': 'hidden', 'name': 'basket_filter', 'value': "{{ oUIBlock.GetBasketFilter()|raw }}"})
)
.append($('<input/>')
.attr({'type': 'hidden', 'name': 'basket_class', 'value': "{{ oUIBlock.GetBasketClass()|raw }}"})
)
.append($('<input/>')
.attr({'type': 'hidden', 'name': 'back_url', 'value': window.location.href})

3
templates/base/components/navigation/layout.html.twig
View File

@@ -5,7 +5,8 @@
{% block iboNavigation %}
<form id='ibo-form-navigation' class='ibo-navigation-form' method='post'>
<input type='hidden' name='list_navigation' value='{{ oUIBlock.GetList() }}'/>
<input type='hidden' name='filter' value='{{ oUIBlock.GetFilter() }}'/>
<input type='hidden' name='basket_class' value='{{ oUIBlock.GetBasketClass() }}'/>
<input type='hidden' name='basket_filter' value='{{ oUIBlock.GetBasketFilter() }}'/>
<input type='hidden' name='back_posted_fields' value='{{ oUIBlock.GetPostedFields()|raw }}'/>
<input type='hidden' name='back_url' value='{{ oUIBlock.GetBackUrl()|raw }}'/>
<div class='ibo-form-navigation--nav fas fa-angle-up' id='{{ oUIBlock.GetId() }}-back'></div>

13
templates/base/components/navigation/layout.js.twig
View File

@@ -2,11 +2,16 @@
{# @license http://opensource.org/licenses/AGPL-3.0 #}
$('#{{ oUIBlock.GetId() }}-back').on('click', function () {
$('#ibo-form-navigation').attr('action', ' {{ oUIBlock.GetBackUrl() | raw }} ');
$('#ibo-form-navigation').attr('action', '{{ oUIBlock.GetBackUrl() | raw }}');
$('#ibo-form-navigation').attr('method', 'post');
$('#ibo-form-navigation').find('[name=basket_filter]').val('');
JSON.parse('{{ oUIBlock.GetPostedFields() | raw }}', (key, value) => {
$('#ibo-form-navigation').append($('<input/>').attr({'type': 'hidden', 'name': key, 'value': value}));
});
if ('{{ oUIBlock.GetPostedFields() | raw }}' != '')
{
JSON.parse('{{ oUIBlock.GetPostedFields() | raw }}', (key, value) => {
$('#ibo-form-navigation').append($('<input/>').attr({'type': 'hidden', 'name': key, 'value': value}));
});
}
$('#ibo-form-navigation').submit();
});