composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-18 16:18:47 +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

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,