Browse Source

Enablers for the current setup improvements

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1150 a333f486-631f-4898-b8df-5754b55c2be0
romainq 14 years ago
parent
commit
685f5ca185
2 changed files with 6 additions and 0 deletions
  1. 1 0
      core/metamodel.class.php
  2. 5 0
      setup/setuppage.class.inc.php

+ 1 - 0
core/metamodel.class.php

@@ -523,6 +523,7 @@ abstract class MetaModel
 			}
 			}
 			else
 			else
 			{
 			{
+				// If the format changes here, do not forget to update the setup index page (detection of installed modules)
 				return self::$m_sTablePrefix.$sTableRaw;
 				return self::$m_sTablePrefix.$sTableRaw;
 			}
 			}
 		}
 		}

+ 5 - 0
setup/setuppage.class.inc.php

@@ -269,6 +269,11 @@ table.formTable {
 
 
 	public static function AddModule($sFilePath, $sId, $aArgs)
 	public static function AddModule($sFilePath, $sId, $aArgs)
 	{
 	{
+		if (!array_key_exists('itop_version', $aArgs))
+		{
+			// Assume 1.0.2
+			$aArgs['itop_version'] = '1.0.2';
+		}
 		foreach (self::$m_aModuleArgs as $sArgName => $sArgDesc)
 		foreach (self::$m_aModuleArgs as $sArgName => $sArgDesc)
 		{
 		{
 			if (!array_key_exists($sArgName, $aArgs))
 			if (!array_key_exists($sArgName, $aArgs))