From 2b69c5210fd7c12747cf22549c59592c502c0316 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Mon, 29 Nov 2010 13:26:18 +0000 Subject: [PATCH] Fixed issues in the compatibility with config files generated with 1.0 SVN:trunk[991] --- core/config.class.inc.php | 5 ++++- .../itop-config-mgmt-1.0.0/model.itop-config-mgmt.php | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/config.class.inc.php b/core/config.class.inc.php index 6ec467d7e..a72c952b0 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -417,7 +417,10 @@ class Config } $this->m_aAppModules = $MyModules['application']; $this->m_aDataModels = $MyModules['business']; - $this->m_aWebServiceCategories = isset($MyModules['webservices']) ? $MyModules['webservices'] : array(); + if (isset($MyModules['webservices'])) + { + $this->m_aWebServiceCategories = $MyModules['webservices']; + } $this->m_aAddons = $MyModules['addons']; $this->m_aDictionaries = $MyModules['dictionaries']; diff --git a/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php b/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php index dcd88eaea..548e37d24 100644 --- a/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php +++ b/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php @@ -1604,6 +1604,16 @@ class lnkProcessToSolution extends cmdbAbstractObject //////////////////////////////////////////////////////////////////////////////////// // Create the top-level group. fRank = 1, means it will be inserted after the group '0', which is usually 'Welcome' + +// Note (RQ) : +// After 1.0.1, the welcome page and menus have been removed from the application +// and put into a separate module "itop-welcome-itil" +// Until we develop a migration utility, and as would like to preserve the +// capability to upgrade iTop without any manual operation, we have decided to +// implement this dirty workaround that makes it... +require_once(APPROOT.'modules/itop-welcome-itil/model.itop-welcome-itil.php'); + + $oAdminMenu = new MenuGroup('DataAdministration', 70 /* fRank */, 'Organization', UR_ACTION_MODIFY, UR_ALLOWED_YES|UR_ALLOWED_DEPENDS); $iAdminGroup = $oAdminMenu->GetIndex();