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

N°3123 : Fix create shortcuts and set preferences

Browse Source
This commit is contained in:
acognet
2020-12-11 19:23:20 +01:00
parent 17cecde604
commit 43a2b5cda6
18 changed files with 118 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,9 @@ class DataTable extends UIContentBlock
{
parent::__construct($sId);
$this->AddDeferredBlock(new DataTableConfig($this));
$this->aDisplayColumns = [];
$this->aOptions = [];
$this->aResultColumns = [];
}
/**

6
sources/application/UI/Base/Component/DataTable/DataTableFactory.php
View File

@@ -355,6 +355,12 @@ class DataTableFactory
$aOptions['bViewLink'] = $bViewLink;
$aOptions['sListId'] = $sListId;
$aOptions['oClassAliases'] = json_encode($aClassAliases);
if (isset($aExtraParams['selected_rows']) && !empty($aExtraParams['selected_rows'])){
$aOptions['sSelectedRows'] = json_encode($aExtraParams['selected_rows']);
} else {
$aOptions['sSelectedRows'] = '[]';
}
$oDataTable->SetOptions($aOptions);
$oDataTable->SetAjaxUrl(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php");

7
sources/application/UI/Base/Component/DataTable/DataTableSettings.php
View File

@@ -136,10 +136,9 @@ class DataTableSettings implements Serializable
if (array_key_exists($sNormalizedFName, $aSortOrder)) {
$sSort = $aSortOrder[$sNormalizedFName] ? 'asc' : 'desc';
}
$aColumns[$sAlias]['_key_'] = $oSettings->GetFieldData($sAlias, '_key_', null, true /* bChecked */, $sSort);
}
foreach ($aList as $sAttCode) {
$aColumns[$sAlias]['_key_'] = $oSettings->GetFieldData($sAlias, '_key_', null, true /* bChecked */, "none");
foreach ($aList as $sAttCode) {
$sSort = 'none';
if (array_key_exists($sAttCode, $aSortOrder)) {
$sSort = $aSortOrder[$sAttCode] ? 'asc' : 'desc';
@@ -324,7 +323,7 @@ class DataTableSettings implements Serializable
$sLabel = Dict::Format('UI:ExtKey_AsLink', MetaModel::GetName($this->aClassAliases[$sAlias]));
$ret = array(
'label' => $sLabel,
'checked' => true,
'checked' => $bChecked,
'disabled' => true,
'alias' => $sAlias,
'code' => $sAttCode,