From 312a5b246be8da36227c51682cd99cdf4d80ac07 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Wed, 24 Nov 2021 16:55:34 +0100 Subject: [PATCH 1/9] =?UTF-8?q?N=C2=B04399=20Fix=20memory=20error=20on=20s?= =?UTF-8?q?etup=20when=20lots=20of=20attachment=20in=20DB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- datamodels/2.x/itop-attachments/module.itop-attachments.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/datamodels/2.x/itop-attachments/module.itop-attachments.php b/datamodels/2.x/itop-attachments/module.itop-attachments.php index 838b57291..068b3c91e 100644 --- a/datamodels/2.x/itop-attachments/module.itop-attachments.php +++ b/datamodels/2.x/itop-attachments/module.itop-attachments.php @@ -177,6 +177,12 @@ SQL; SetupPage::log_info("Initializing attachment/item_org_id - zero to the container"); $oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE item_org_id = 0"); $oSet = new DBObjectSet($oSearch); + $oSet->OptimizeColumnLoad([ + 'Attachment' => [ + 'item_class', + 'item_id', + ] + ]); $iUpdated = 0; while ($oAttachment = $oSet->Fetch()) { From ed3c387712f11845d4c0a6287072af4cb689255e Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Thu, 25 Nov 2021 10:51:20 +0100 Subject: [PATCH 2/9] =?UTF-8?q?N=C2=B04478=20Update=20Datatables=20lib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/src/views/layout.html.twig | 10 +- .../datatables.net-fixedheader/License.txt | 20 + .../lib/datatables.net-fixedheader/Readme.md | 50 + .../js/dataTables.fixedHeader.js | 736 + .../js/dataTables.fixedHeader.min.js | 19 + .../datatables.net-fixedheader/package.json | 36 + .../lib/datatables.net-responsive/License.txt | 20 + .../lib/datatables.net-responsive/Readme.md | 50 + .../js/dataTables.responsive.js | 1474 ++ .../js/dataTables.responsive.min.js | 32 + .../datatables.net-responsive/package.json | 31 + .../lib/datatables.net-scroller/License.txt | 20 + .../web/lib/datatables.net-scroller/Readme.md | 50 + .../js/dataTables.scroller.js | 1416 ++ .../js/dataTables.scroller.min.js | 28 + .../lib/datatables.net-scroller/package.json | 31 + .../web/lib/datatables.net-select/License.txt | 20 + .../web/lib/datatables.net-select/Readme.md | 50 + .../js/dataTables.select.js | 1214 ++ .../js/dataTables.select.min.js | 28 + .../lib/datatables.net-select/package.json | 36 + .../portal/web/lib/datatables.net/License.txt | 22 + .../portal/web/lib/datatables.net/Readme.md | 56 + .../datatables.net/js/jquery.dataTables.js | 15332 ++++++++++++++++ .../js/jquery.dataTables.min.js | 187 + .../web/lib/datatables.net/package.json | 42 + .../web/lib/datatables.net/types/types.d.ts | 2714 +++ .../js/dataTables.fixedHeader.min.js | 17 - .../js/dataTables.responsive.min.js | 26 - .../datatables/js/dataTables.scroller.min.js | 27 - .../datatables/js/dataTables.select.min.js | 26 - .../datatables/js/jquery.dataTables.min.js | 166 - 32 files changed, 23719 insertions(+), 267 deletions(-) create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-fixedheader/License.txt create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-fixedheader/Readme.md create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-fixedheader/js/dataTables.fixedHeader.js create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-fixedheader/js/dataTables.fixedHeader.min.js create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-fixedheader/package.json create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-responsive/License.txt create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-responsive/Readme.md create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-responsive/js/dataTables.responsive.js create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-responsive/js/dataTables.responsive.min.js create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-responsive/package.json create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-scroller/License.txt create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-scroller/Readme.md create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-scroller/js/dataTables.scroller.js create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-scroller/js/dataTables.scroller.min.js create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-scroller/package.json create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-select/License.txt create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-select/Readme.md create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-select/js/dataTables.select.js create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-select/js/dataTables.select.min.js create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-select/package.json create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net/License.txt create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net/Readme.md create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net/js/jquery.dataTables.js create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net/js/jquery.dataTables.min.js create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net/package.json create mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net/types/types.d.ts delete mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables/js/dataTables.fixedHeader.min.js delete mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables/js/dataTables.responsive.min.js delete mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables/js/dataTables.scroller.min.js delete mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables/js/dataTables.select.min.js delete mode 100644 datamodels/2.x/itop-portal-base/portal/web/lib/datatables/js/jquery.dataTables.min.js diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig index e0356a14f..fd5a2701b 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig @@ -103,12 +103,12 @@ {# Moment.js with locales#} {# Datatables #} - + - - - - + + + + {# Export for Datatables #} diff --git a/datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-fixedheader/License.txt b/datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-fixedheader/License.txt new file mode 100644 index 000000000..379a7e7c8 --- /dev/null +++ b/datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-fixedheader/License.txt @@ -0,0 +1,20 @@ +Copyright SpryMedia Limited and other contributors +http://datatables.net + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-fixedheader/Readme.md b/datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-fixedheader/Readme.md new file mode 100644 index 000000000..eb70e845e --- /dev/null +++ b/datamodels/2.x/itop-portal-base/portal/web/lib/datatables.net-fixedheader/Readme.md @@ -0,0 +1,50 @@ +# FixedHeader for DataTables + +This package contains distribution files for the [FixedHeader extension](https://datatables.net/extensions/fixedheader) for [DataTables](https://datatables.net/). Only the core software for this library is contained in this package - to be correctly styled, a styling package for FixedHeader must also be included. Styling options include DataTable's native styling, [Bootstrap](http://getbootstrap.com) and [Foundation](http://foundation.zurb.com/). + +When displaying large amounts of data in a table, it can often be useful for the end user to have the column titles always visible. This is particularly true if using DataTables with pagination disabled, or the display length is set to a high value. The FixedHeader extension provides this ability. + + +## Installation + +### Browser + +For inclusion of this library using a standard `