composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-20 09:08:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°331 - L'ordre de tri des tickets change au rechargement auto - add ability to give to Menu how to refresh the panel

Browse Source
This commit is contained in:
acognet
2021-01-28 11:02:56 +01:00
parent 2eae1e81d1
commit ff44fcdfe0
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/displayblock.class.inc.php
View File

@@ -1727,7 +1727,7 @@ class MenuBlock extends DisplayBlock
}
$sClass = $this->m_oFilter->GetClass();
$oSet = new CMDBObjectSet($this->m_oFilter);
$sRefreshAction = '';
$sRefreshAction = $aExtraParams['sRefreshAction']??'';
$aActions = [];
if ((!isset($aExtraParams['selection_mode']) || $aExtraParams['selection_mode'] == "") && $this->m_sStyle != 'listInObject') {
$oAppContext = new ApplicationContext();
@@ -1780,7 +1780,7 @@ class MenuBlock extends DisplayBlock
}
} else {
$id = $oObj->GetKey();
if (utils::ReadParam('operation') == 'details') {
if (empty($sRefreshAction) && utils::ReadParam('operation') == 'details') {
if ($_SERVER['REQUEST_METHOD'] == 'GET') {
$sRefreshAction = "window.location.reload();";
} else {

5
sources/application/UI/Base/Component/DataTable/DataTable.php
View File

@@ -158,4 +158,9 @@ class DataTable extends UIContentBlock
{
$this->aOptions = $aOptions;
}
public function GetJSRefresh():array{
return ["$('#".$this->sId."').DataTable().clearPipeline();
$('#".$this->sId."').DataTable().ajax.reload(null, false);"];
}
}

1
sources/application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
View File

@@ -108,6 +108,7 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
{
if (!isset($aExtraParams['menu']) || $aExtraParams['menu']) {
$oMenuBlock = new MenuBlock($oSet->GetFilter(), $sStyle);
$aExtraParams['sRefreshAction'] = $oDataTable->GetJSRefresh()[0];
$oBlockMenu = $oMenuBlock->GetRenderContent($oPage, $aExtraParams, $sListId);
} else {
$oBlockMenu = new UIContentBlock();