composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issues in the compatibility with config files generated with 1.0

Browse Source 
SVN:trunk[991]
This commit is contained in:
Romain Quetiez
2010-11-29 13:26:18 +00:00
parent 7531dd8b19
commit 2b69c5210f
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/config.class.inc.php
View File

@@ -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
modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php
View File

@@ -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();