composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-25 13:24:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°4260 - Fix display of log attributes in list

Browse Source
This commit is contained in:
acognet
2021-09-21 10:56:55 +02:00
parent 469c1553bf
commit ab17eaad27
5 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -372,7 +372,8 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
if ($oAttDef instanceof \AttributeCaseLog) {
// Add JS file for display caselog
$oDataTable->AddMultipleJsFilesRelPaths(CollapsibleSection::DEFAULT_JS_FILES_REL_PATH);
$sCollapsibleSection = new CollapsibleSection('');
$oDataTable->AddMultipleJsFilesRelPaths($sCollapsibleSection->GetJsFilesUrlRecursively());
}
$sAttDefClass = get_class($oAttDef);
$sAttLabel = $oAttDef->GetLabel();
@@ -619,7 +620,9 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
if ($oAttDef instanceof \AttributeCaseLog) {
// Removed from the display list
$oDataTable->AddMultipleJsFilesRelPaths(CollapsibleSection::DEFAULT_JS_FILES_REL_PATH);
//collapsible Section create in order to get JS files
$sCollapsibleSection = new CollapsibleSection('');
$oDataTable->AddMultipleJsFilesRelPaths($sCollapsibleSection->GetJsFilesUrlRecursively());
}
$sAttDefClass = get_class($oAttDef);
$sAttLabel = MetaModel::GetLabel($sClassName, $sAttCode);
@@ -765,7 +768,9 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
if ($oAttDef instanceof \AttributeCaseLog) {
// Get JS files
$aJsFiles = array_merge($aJsFiles, CollapsibleSection::DEFAULT_JS_FILES_REL_PATH);
//collapsible Section create in order to get JS files
$sCollapsibleSection = new CollapsibleSection('');
$aJsFiles = array_merge($aJsFiles, $sCollapsibleSection->GetJsFilesUrlRecursively());
}
$sAttDefClass = get_class($oAttDef);
$sAttLabel = MetaModel::GetLabel($sClassName, $sAttCode);