Sfoglia il codice sorgente

Fixed issues in the compatibility with config files generated with 1.0

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@991 a333f486-631f-4898-b8df-5754b55c2be0
romainq 14 anni fa
parent
commit
002dc59c6a

+ 4 - 1
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'];
 

+ 10 - 0
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();