浏览代码

Record the very same installation time for all modules.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3052 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 11 年之前
父节点
当前提交
ee86df9575
共有 2 个文件被更改,包括 4 次插入6 次删除
  1. 0 6
      setup/moduleinstallation.class.inc.php
  2. 4 0
      setup/runtimeenv.class.inc.php

+ 0 - 6
setup/moduleinstallation.class.inc.php

@@ -57,12 +57,6 @@ class ModuleInstallation extends cmdbAbstractObject
 //		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
 //		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
-
-	protected function OnInsert()
-	{
-		$this->Set('installed', time());
-		parent::OnInsert();
-	}
 }
 
 ?>

+ 4 - 0
setup/runtimeenv.class.inc.php

@@ -466,11 +466,13 @@ class RunTimeEnvironment
 		$aData = array(
 			'source_dir' => $oConfig->Get('source_dir'),
 		);
+		$iInstallationTime = time(); // Make sure that all modules record the same installation time
 		$oInstallRec = new ModuleInstallation();
 		$oInstallRec->Set('name', DATAMODEL_MODULE);
 		$oInstallRec->Set('version', $sDataModelVersion);
 		$oInstallRec->Set('comment', json_encode($aData));
 		$oInstallRec->Set('parent_id', 0); // root module
+		$oInstallRec->Set('installed', $iInstallationTime);
 		$iMainItopRecord = $oInstallRec->DBInsertNoReload();
 		
 		// Record main installation
@@ -479,6 +481,7 @@ class RunTimeEnvironment
 		$oInstallRec->Set('version', ITOP_VERSION.'.'.ITOP_REVISION);
 		$oInstallRec->Set('comment', "Done by the setup program\nBuilt on ".ITOP_BUILD_DATE);
 		$oInstallRec->Set('parent_id', 0); // root module
+		$oInstallRec->Set('installed', $iInstallationTime);
 		$iMainItopRecord = $oInstallRec->DBInsertNoReload();
 	
 		
@@ -519,6 +522,7 @@ class RunTimeEnvironment
 			$oInstallRec->Set('version', $sVersion);
 			$oInstallRec->Set('comment', $sComment);
 			$oInstallRec->Set('parent_id', $iMainItopRecord);
+			$oInstallRec->Set('installed', $iInstallationTime);
 			$oInstallRec->DBInsertNoReload();
 		}
 		// Database is created, installation has been tracked into it