From 2773a8bf2feb653424396e43b14538a154b43623 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Mon, 31 Dec 2018 14:37:18 +0100 Subject: [PATCH 1/4] =?UTF-8?q?N=C2=B01917=20Setup:=20Fix=20warnings=20whe?= =?UTF-8?q?n=20upgrading=20an=20extension=20with=20an=20extension.xml=20fi?= =?UTF-8?q?le?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 4eb416d40791f28ba9ee981b785034ac7dc33405) --- setup/extensionsmap.class.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/extensionsmap.class.inc.php b/setup/extensionsmap.class.inc.php index 7d95c23afb..c3e9d27e15 100644 --- a/setup/extensionsmap.class.inc.php +++ b/setup/extensionsmap.class.inc.php @@ -308,12 +308,12 @@ class iTopExtensionsMap $sModuleVersion = '0.0.1'; } - if ($sParentExtensionId !== null) + if (($sParentExtensionId !== null) && (array_key_exists($sParentExtensionId, $this->aExtensions)) && ($this->aExtensions[$sParentExtensionId] instanceof iTopExtension)) { // Already inside an extension, let's add this module the list of modules belonging to this extension $this->aExtensions[$sParentExtensionId]->aModules[] = $sModuleName; $this->aExtensions[$sParentExtensionId]->aModuleVersion[$sModuleName] = $sModuleVersion; - } + } else { // Not already inside an folder containing an 'extension.xml' file From 2b563d4fc879d18cde259fc3f06c32ed6f005425 Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Mon, 7 Jan 2019 16:24:31 +0100 Subject: [PATCH 2/4] Remove debug traces when updating objects A very verbose debug trace in the error log was happening each time a CmdbAbstractObject gets created non-interactively. --- core/inlineimage.class.inc.php | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/core/inlineimage.class.inc.php b/core/inlineimage.class.inc.php index da39298fbf..73383be8a4 100644 --- a/core/inlineimage.class.inc.php +++ b/core/inlineimage.class.inc.php @@ -178,18 +178,19 @@ class InlineImage extends DBObject $oInlineImage->DBUpdate(); } } - else - { - IssueLog::Error('InlineImage: Error during FinalizeInlineImages(), no transaction ID for object '.get_class($oObject).'#'.$oObject->GetKey().'.'); - - IssueLog::Error('|- Call stack:'); - $oException = new Exception(); - $sStackTrace = $oException->getTraceAsString(); - IssueLog::Error($sStackTrace); - - IssueLog::Error('|- POST vars:'); - IssueLog::Error(print_r($_POST, true)); - } +// For tracing issues with Inline Images... but beware not all updates are interactive, so this trace happens when creating objects non-interactively (REST, Synchro...) +// else +// { +// IssueLog::Error('InlineImage: Error during FinalizeInlineImages(), no transaction ID for object '.get_class($oObject).'#'.$oObject->GetKey().'.'); +// +// IssueLog::Error('|- Call stack:'); +// $oException = new Exception(); +// $sStackTrace = $oException->getTraceAsString(); +// IssueLog::Error($sStackTrace); +// +// IssueLog::Error('|- POST vars:'); +// IssueLog::Error(print_r($_POST, true)); +// } } /** From 11ec46c18be65b7cd406245fdba296df58978592 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 8 Jan 2019 15:19:52 +0100 Subject: [PATCH 3/4] =?UTF-8?q?N=C2=B01408=20-=20Fix=20overview=20attribut?= =?UTF-8?q?e=20when=20not=20already=20defined=20in=20Organization=20class?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml | 2 +- .../2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml index 073fba1d7e..47e8ff3c1e 100755 --- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml +++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml @@ -1725,7 +1725,7 @@ - + diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml index c7122fa838..600d25ae1e 100755 --- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml +++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml @@ -1747,7 +1747,7 @@ - + From 5d09841cd57f5e7f4ef35dbf73de5111b0916af5 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Wed, 9 Jan 2019 09:53:20 +0100 Subject: [PATCH 4/4] :memo: Update install.txt for 2.6.0 --- install.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.txt b/install.txt index 0153f65e14..560b913491 100644 --- a/install.txt +++ b/install.txt @@ -1,3 +1,3 @@ For installation instructions, please refer to: -https://wiki.openitop.org/doku.php?id=2_4_0:install:start \ No newline at end of file +https://wiki.openitop.org/doku.php?id=2_6_0:install:start \ No newline at end of file