From c106caf92466cc81297c141c9f13873acb0cd678 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 14 Dec 2020 14:31:35 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B03123=20-=20Fix=20dashlets=20GroupBy=20an?= =?UTF-8?q?d=20Object=20List?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/dashlet.class.inc.php | 1 + .../Component/DataTable/StaticTable/StaticTable.php | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/application/dashlet.class.inc.php b/application/dashlet.class.inc.php index f6fc7e22a..0de3572aa 100644 --- a/application/dashlet.class.inc.php +++ b/application/dashlet.class.inc.php @@ -911,6 +911,7 @@ class DashletObjectList extends Dashlet $aParams = array( 'menu' => $sShowMenu, 'table_id' => self::APPUSERPREFERENCES_PREFIX.$this->sId, + 'surround_with_panel' => false, ); $sBlockId = 'block_'.$this->sId.($bEditMode ? '_edit' : ''); // make a unique id (edition occurring in the same DOM) $oBlock->DisplayIntoContentBlock($oPanel, $oPage, $sBlockId, array_merge($aExtraParams, $aParams)); diff --git a/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php b/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php index bf5881389..71880e953 100644 --- a/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php +++ b/sources/application/UI/Base/Component/DataTable/StaticTable/StaticTable.php @@ -19,6 +19,17 @@ class StaticTable extends UIContentBlock public const BLOCK_CODE = 'ibo-datatable'; public const DEFAULT_HTML_TEMPLATE_REL_PATH = 'base/components/datatable/static/layout'; public const DEFAULT_JS_TEMPLATE_REL_PATH = 'base/components/datatable/static/layout'; + public const DEFAULT_JS_FILES_REL_PATH = [ + 'lib/datatables/js/jquery.dataTables.min.js', + 'lib/datatables/js/dataTables.bootstrap.min.js', + 'lib/datatables/js/dataTables.fixedHeader.min.js', + 'lib/datatables/js/dataTables.responsive.min.js', + 'lib/datatables/js/dataTables.scroller.min.js', + 'lib/datatables/js/dataTables.select.min.js', + 'js/dataTables.main.js', + 'js/dataTables.settings.js', + 'js/dataTables.pipeline.js', + ]; /** * @var array of 'entry name' => [