Fixed issue in data model (could not view SW instances)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@577 a333f486-631f-4898-b8df-5754b55c2be0

core/metamodel.class.php

@@ -1028,10 +1028,17 @@ abstract class MetaModel
 							));
 							$oClassRecall->SetHostClass($sClass);
 							self::$m_aAttribDefs[$sClass][$sClassRecallAttCode] = $oClassRecall;
-							self::$m_aAttribOrigins[$sClass][$sClassRecallAttCode] = $oClassRecall;
+							self::$m_aAttribOrigins[$sClass][$sClassRecallAttCode] = $sRemoteClass;
+
+							$oClassFlt = new FilterFromAttribute($oClassAtt);
+							self::$m_aFilterDefs[$sClass][$sClassRecallAttCode] = $oClassFlt;
+							self::$m_aFilterOrigins[$sClass][$sClassRecallAttCode] = $sRemoteClass;
 
 							// Add it to the ZLists where the external key is present
-							foreach(self::$m_aListData[$sClass] as $sListCode => $aAttributes)
+							//foreach(self::$m_aListData[$sClass] as $sListCode => $aAttributes)
+							$sListCode = 'list';
+							$aAttributes = self::$m_aListData[$sClass][$sListCode];
+							// temporary.... no loop
 							{
 								if (in_array($sAttCode, $aAttributes))
 								{
@@ -3086,6 +3093,8 @@ abstract class MetaModel
 	{
 		self::LoadConfig($sConfigFile);
 		if (self::DBExists())
+// !!!! #@# 
+		//if (true)
 		{
 			CMDBSource::SelectDB(self::$m_sDBName);
 

modules/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php

@@ -368,6 +368,23 @@ Dict::Add('EN US', 'English', 'English', array(
 ));
 
 //
+// Class: Software
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Software' => 'Software',
+	'Class:Software+' => '',
+	'Class:Software/Attribute:name' => 'Name',
+	'Class:Software/Attribute:name+' => '',
+	'Class:Software/Attribute:description' => 'Description',
+	'Class:Software/Attribute:description+' => '',
+	'Class:Software/Attribute:instance_list' => 'Installations',
+	'Class:Software/Attribute:instance_list+' => 'Instances of this software',
+	'Class:Software/Attribute:finalclass' => 'Type',
+	'Class:Software/Attribute:finalclass+' => '',
+));
+
+//
 // Class: Application
 //
 

modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php

@@ -784,7 +784,7 @@ class DBServerInstance extends SoftwareInstance
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
 
-		MetaModel::Init_OverloadAttributeParams("software_id", array("targetclass"=>"DBServer"));
+		//MetaModel::Init_OverloadAttributeParams("software_id", array("targetclass"=>"DBServer"));
 		//MetaModel::Init_OverloadAttributeParams("software_id", array("allowed_values"=>new ValueSetObjects('SELECT DBServer')));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSet("dbinstance_list", array("linked_class"=>"DatabaseInstance", "ext_key_to_me"=>"db_server_instance_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
 
@@ -813,7 +813,7 @@ class ApplicationInstance extends SoftwareInstance
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
 
-		MetaModel::Init_OverloadAttributeParams("software_id", array("targetclass"=>"Application"));
+		//MetaModel::Init_OverloadAttributeParams("software_id", array("targetclass"=>"Application"));
 
 		MetaModel::Init_SetZListItems('details', array('name', 'status', 'org_id', 'importance', 'device_id', 'licence_id', 'software_id', 'version', 'description', 'contact_list', 'document_list', 'solution_list', 'contract_list', 'ticket_list'));
 		MetaModel::Init_SetZListItems('advanced_search', array('status', 'org_id', 'importance', 'device_id', 'licence_id', 'software_id', 'version'));