From 2ad3b3c27e2d75e7d6702b77a155085a84f413ef Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Thu, 15 Apr 2021 15:03:13 +0200 Subject: [PATCH 1/5] :art: Fix \DeadLockLog::Log parameter name + PHPDoc Thanks @Hipska ! --- core/log.class.inc.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/core/log.class.inc.php b/core/log.class.inc.php index dfb0fa3e6..1b93546a6 100644 --- a/core/log.class.inc.php +++ b/core/log.class.inc.php @@ -740,7 +740,7 @@ class DeadLockLog extends LogAPI return self::CHANNEL_WAIT_TIMEOUT; break; case 1213: - return self::CHANNEL_DEADLOCK_FOUND; + return self::CHANNEL_DEADLOCK_FOUND; break; default: return self::CHANNEL_DEFAULT; @@ -749,17 +749,18 @@ class DeadLockLog extends LogAPI } /** - * @param int $iMySQLErrNo will be converted to channel using {@link GetChannelFromMysqlErrorNo} + * @param string $sLevel * @param string $sMessage - * @param null $iMysqlErroNo + * @param int $iMysqlErrorNumber will be converted to channel using {@link GetChannelFromMysqlErrorNo} * @param array $aContext * * @throws \Exception + * @noinspection PhpParameterNameChangedDuringInheritanceInspection */ - public static function Log($iMySQLErrNo, $sMessage, $iMysqlErroNo = null, $aContext = array()) + public static function Log($sLevel, $sMessage, $iMysqlErrorNumber = null, $aContext = array()) { - $sChannel = self::GetChannelFromMysqlErrorNo($iMysqlErroNo); - parent::Log($iMySQLErrNo, $sMessage, $sChannel, $aContext); + $sChannel = self::GetChannelFromMysqlErrorNo($iMysqlErrorNumber); + parent::Log($sLevel, $sMessage, $sChannel, $aContext); } } From 87ba67225afcbba401c76f8a39eb0309d862131f Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Fri, 16 Apr 2021 08:35:59 +0200 Subject: [PATCH 2/5] :bulb: Add since phpdoc tags for \DeadLockLog::Log --- core/log.class.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/log.class.inc.php b/core/log.class.inc.php index 1b93546a6..f16e42d95 100644 --- a/core/log.class.inc.php +++ b/core/log.class.inc.php @@ -756,6 +756,9 @@ class DeadLockLog extends LogAPI * * @throws \Exception * @noinspection PhpParameterNameChangedDuringInheritanceInspection + * + * @since 2.7.1 method creation + * @since 2.7.5 3.0.0 rename param names and fix phpdoc (thanks Hipska !) */ public static function Log($sLevel, $sMessage, $iMysqlErrorNumber = null, $aContext = array()) { From 07257cc2d2829620f1f680c4873df90993e7463b Mon Sep 17 00:00:00 2001 From: bruno-ds Date: Wed, 21 Apr 2021 09:25:10 +0200 Subject: [PATCH 3/5] =?UTF-8?q?N=C2=B03671=20-=20fix=20a=20code=20comment?= =?UTF-8?q?=20too=20evasive?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit thanks @Hipska --- setup/wizardsteps.class.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php index 7edbaeb40..2d96d9eea 100644 --- a/setup/wizardsteps.class.inc.php +++ b/setup/wizardsteps.class.inc.php @@ -1125,7 +1125,7 @@ class WizStepUpgradeMiscParams extends WizardStep public function Display(WebPage $oPage) { - $sApplicationURL = $this->oWizard->GetParameter('application_url', utils::GetAbsoluteUrlAppRoot(true)); //Preserve existing configuration. + $sApplicationURL = $this->oWizard->GetParameter('application_url', utils::GetAbsoluteUrlAppRoot(true)); //Preserve existing configuration (except for the str_replace based joker $SERVER_NAME$ which is lost) $sDefaultGraphvizPath = (strtolower(substr(PHP_OS, 0, 3)) === 'win') ? 'C:\\Program Files\\Graphviz\\bin\\dot.exe' : '/usr/bin/dot'; $sGraphvizPath = $this->oWizard->GetParameter('graphviz_path', $sDefaultGraphvizPath); $oPage->add('

Additional parameters

'); From bac92716f3ac7e8293e6ae0aa923e518559aa573 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Tue, 4 May 2021 08:57:53 +0200 Subject: [PATCH 4/5] :page_facing_up: Update Font Awesome license Was duplicated... And also not the correct license ! Source for new license text : https://github.com/FortAwesome/Font-Awesome/blob/master/LICENSE.txt (modification already committed to develop : f8f9c2d7) --- setup/licenses/community-licenses.xml | 35 +++------------------------ 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/setup/licenses/community-licenses.xml b/setup/licenses/community-licenses.xml index 7d4bd989b..ab160ef20 100644 --- a/setup/licenses/community-licenses.xml +++ b/setup/licenses/community-licenses.xml @@ -1667,36 +1667,9 @@ under the Apache 2 license.]]> Font Awesome - Dave Gandy - MIT - -The MIT License (MIT) - -Copyright (c) 2011-2016 Dave Gandy - -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.]]> - - - font-awesome - Travis Chase Dave Gandy Rob Madole Jory Raphael Geremia Taglialatela Brian Talbot Mike Wilkerson - GPL - Font Awesome team + Font Awesome Free License + - + apereo/phpcas Joachim Fritschi - Adam Franco From acf828b72e463401be9df4ad7e379c2d2e1d521b Mon Sep 17 00:00:00 2001 From: Molkobain Date: Tue, 11 May 2021 12:10:31 +0200 Subject: [PATCH 5/5] =?UTF-8?q?N=C2=B03995=20-=20Portal:=20Fix=20loader=20?= =?UTF-8?q?not=20displaying=20in=20BrowseBrick=20for=20tree/mosaic=20modes?= =?UTF-8?q?=20with=20huge=20amount=20of=20data?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/templates/bricks/browse/mode_mosaic.html.twig | 7 ++++--- .../portal/templates/bricks/browse/mode_tree.html.twig | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig index cca764f54..17bbb7c20 100644 --- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig @@ -397,15 +397,16 @@ } } }; - + + // N°3995: Loader is shown immediately, otherwise when we have a huge amount of items, we can have a bottleneck on the buildMosaic() function, blocking the display of the loader + showMosaicLoader(); $(document).ready(function(){ // Auto collapse item actions popup $('body').click(function(){ $('#brick_content_mosaic .item-action-wrapper.collapse.in').collapse('hide'); }); - // Build the tree (collapsed) - showMosaicLoader(); + // Build the mosaic (collapsed) buildMosaic(oRawDatas); hideMosaicLoader(); registerFilterListeners(); diff --git a/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig index 1ecd1b988..e850f80d2 100644 --- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig @@ -321,6 +321,8 @@ } }; + // N°3995: Loader is shown immediately, otherwise when we have a huge amount of items, we can have a bottleneck on the buildTree() function, blocking the display of the loader + showTreeLoader(); $(document).ready(function(){ // Init expand/collapse all buttons $('#btn-collapse-all').on('click', function (oEvent) { @@ -405,7 +407,6 @@ }); // Build the tree (collapsed) - showTreeLoader(); buildTree(oRawDatas); hideTreeLoader(); registerFilterListeners();