- Fxied the display (after modification) of n-n LinkedSets

SVN:trunk[553]

application/cmdbabstract.class.inc.php

@@ -159,13 +159,13 @@ abstract class cmdbAbstractObject extends CMDBObject
 					$sLinkedClass = $oAttDef->GetLinkedClass();
 					$oLinkingAttDef = 	MetaModel::GetAttributeDef($sLinkedClass, $oAttDef->GetExtKeyToRemote());
 					$sTargetClass = $oLinkingAttDef->GetTargetClass();
-					
+					$bMenu = ($this->Get($sAttCode)->Count() > 0); // The menu is enabled only if there are already some elements...
 					$aParams = array(
 							'link_attr' => $oAttDef->GetExtKeyToMe(),
 							'object_id' => $this->GetKey(),
 							'target_attr' => $oAttDef->GetExtKeyToRemote(),
 							'view_link' => false,
-							'menu' => true,
+							'menu' => $bMenu,
 						);
 				}
 				$oPage->p("<img src=\"".MetaModel::GetClassIcon($sTargetClass)."\" style=\"vertical-align:middle;\">&nbsp;".$oAttDef->GetDescription());

pages/UI.php

@@ -861,6 +861,7 @@ try
 					$oP->P(Dict::S('UI:ObjectDoesNotExist'));
 				}
 			}
+			$oObj = MetaModel::GetObject(get_class($oObj), $oObj->GetKey()); //Workaround: reload the object some that the linkedset are displayed properly
 			$oObj->DisplayDetails($oP);
 		break;