Browse Source

- Make sure that the data (smaples and structure) from hidden modules are loaded as well. (Symptom: sample EmailNotifications were not loaded)

- Make sure that the "synchrodatasource" file gets loaded as part of the "standard" app modules, even when upgrading "in-place" an existing iTop configuration file.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1185 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 14 years ago
parent
commit
456e75035d
1 changed files with 6 additions and 1 deletions
  1. 6 1
      setup/index.php

+ 6 - 1
setup/index.php

@@ -417,7 +417,7 @@ function PopulateDataFilesList(SetupWebPage $oP, $aParamValues, $oConfig)
 
 	foreach($aAvailableModules as $sModuleId => $aModule)
 	{
-		if (($sModuleId != ROOT_MODULE) && $aModule['visible'])
+		if (($sModuleId != ROOT_MODULE))
 		{
 			if (in_array($sModuleId, $aParamValues['module']))
 			{
@@ -504,6 +504,11 @@ function BuildConfig(SetupWebpage $oP, Config &$oConfig, $aParamValues, $aAvaila
 	// Initialize the arrays below with default values for the application...
 	$aAddOns = $oConfig->GetAddOns();
 	$aAppModules = $oConfig->GetAppModules();
+	// New module in 1.1: synchro, when migrating an *old* configuration file to 1.1 the module may be missing
+	if (!in_array('synchro/synchrodatasource.class.inc.php', $aAppModules))
+	{
+		$aAppModules[] = 'synchro/synchrodatasource.class.inc.php';
+	}
 	$aDataModels = $oConfig->GetDataModels();
 	$aWebServiceCategories = $oConfig->GetWebServiceCategories();
 	$aDictionaries = $oConfig->GetDictionaries();