composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +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

6
application/cmdbabstract.class.inc.php
View File

@@ -3242,8 +3242,10 @@ EOF
{
if ($oAttDef instanceof \AttributeCaseLog) {
// Add JS file for display caselog
foreach (CollapsibleSection::DEFAULT_JS_FILES_REL_PATH as $sJSFile) {
$oPage->add_linked_script('../'.$sJSFile);
//collapsible Section create in order to get JS files
$sCollapsibleSection = new CollapsibleSection('');
foreach ($sCollapsibleSection->GetJsFilesUrlRecursively(true) as $sJSFile) {
$oPage->add_linked_script($sJSFile);
}
}
$aAllowedValues = MetaModel::GetAllowedValues_att($sClass, $sAttCode, $aArgs);

3
css/backoffice/blocks-integrations/_all.scss
View File

@@ -14,4 +14,5 @@
@import "medallion-with-blocklist";
@import "input-within-datatable";
@import "jquery-blockui-within-dialog";
@import "jquery-blockui-within-datatable";
@import "jquery-blockui-within-datatable";
@import "_collapsible-section-within-caselog-list";

29
css/backoffice/blocks-integrations/_collapsible-section-within-caselog-list.scss Normal file
View File

@@ -0,0 +1,29 @@
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
/* SCSS variables */
$ibo-caselog-entry-in-collapsible-section--body--background-color: transparentize($ibo-color-grey-100,0.5) !default;
$ibo-caselog-entry-in-collapsible-section--body--padding: 8px !default;
$ibo-caselog-entry-in-collapsible-section--body--color: $ibo-color-grey-900 !default;
/* - caselog display in ormcaselog */
.ibo-caselog-list {
.ibo-collapsible-section {
margin: 0;
min-width: 22em;
.ibo-collapsible-section--header .ibo-collapsible-section--title {
@extend %ibo-font-size-100;
}
.ibo-collapsible-section--body {
@extend %ibo-font-size-100;
color: $ibo-caselog-entry-in-collapsible-section--body--color;
padding: $ibo-caselog-entry-in-collapsible-section--body--padding;
background-color: $ibo-caselog-entry-in-collapsible-section--body--background-color;
}
}
}

22
css/backoffice/layout/activity-panel/_caselog-entry.scss
View File

@@ -8,10 +8,6 @@ $ibo-caselog-entry--highlight-colors: $ibo-caselog-highlight-colors !default;
$ibo-caselog-entry--main-information--padding-y: 12px !default;
$ibo-caselog-entry--main-information--decoration--width: 3px !default;
$ibo-caselog-entry-in-collapsible-section--body--background-color: #F9F9F9AA !default;
$ibo-caselog-entry-in-collapsible-section--body--padding: 8px !default;
$ibo-caselog-entry-in-collapsible-section--body--color: black !default;
/* Main information */
.ibo-caselog-entry{
.ibo-activity-entry--main-information{
@@ -77,22 +73,4 @@ $ibo-caselog-entry-in-collapsible-section--body--color: black !default;
}
}
}
/* - caselog display vio ormcaselog */
.ibo-caselog-list {
.ibo-collapsible-section {
margin: 0;
min-width: 22em;
.ibo-collapsible-section--header .ibo-collapsible-section--title {
@extend %ibo-font-size-100;
}
.ibo-collapsible-section--body {
@extend %ibo-font-size-100;
color: $ibo-caselog-entry-in-collapsible-section--body--color;
padding: $ibo-caselog-entry-in-collapsible-section--body--padding;
background-color: $ibo-caselog-entry-in-collapsible-section--body--background-color;
}
}
}

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