Proper handling of the parameters to DisplaySet

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

application/cmdbabstract.class.inc.php

@@ -256,9 +256,9 @@ abstract class cmdbAbstractObject extends CMDBObject
 	
 	// Comment by Rom: this helper may be used to display objects of class DBObject
 	//                 -> I am using this to display the changes history
-	public static function DisplaySet(web_page $oPage, CMDBObjectSet $oSet, $sLinkageAttribute = '', $bDisplayMenu = true, $bSelectMode = false, $iObjectId = 0, $sTargetAttribute = '')
+	public static function DisplaySet(web_page $oPage, CMDBObjectSet $oSet, $aExtraParams)
 	{
-		$oPage->add(self::GetDisplaySet($oPage, $oSet, array( 'link_attr' => $sLinkageAttribute, 'object_id' => $iObjectId, 'target_attr' => $sTargetAttribute, 'menu' => $bDisplayMenu, 'selection_mode' => $bSelectMode)));
+		$oPage->add(self::GetDisplaySet($oPage, $oSet, $aExtraParams));
 	}
 	
 	//public static function GetDisplaySet(web_page $oPage, CMDBObjectSet $oSet, $sLinkageAttribute = '', $bDisplayMenu = true, $bSelectMode = false)

application/ui.linkswidget.class.inc.php

@@ -100,12 +100,13 @@ class UILinksWidget
 		{
 		 	// transform the DBObjectSet into a CMDBObjectSet !!!
 			$aLinkedObjects = $oCurrentValuesSet->ToArray(false);
-			if (count($aLinkedObjects) > 0)
-			{
-				$oSet = CMDBObjectSet::FromArray($sLinkedClass, $aLinkedObjects);
-				$oDisplayBlock = DisplayBlock::FromObjectSet($oSet, 'list');
-				$sHTMLValue .= $oDisplayBlock->GetDisplay($oPage, $this->m_iInputId.'_current', array('linkage' => $sExtKeyToMe));
-			}
+			// Actual values will be displayed asynchronously, no need to display them here
+			//if (count($aLinkedObjects) > 0)
+			//{
+			//	$oSet = CMDBObjectSet::FromArray($sLinkedClass, $aLinkedObjects);
+			//	$oDisplayBlock = DisplayBlock::FromObjectSet($oSet, 'list');
+			//	$sHTMLValue .= $oDisplayBlock->GetDisplay($oPage, $this->m_iInputId.'_current', array('linkage' => $sExtKeyToMe, 'menu' => false));
+			//}
 		}
 		$sHTMLValue .= "</div>\n";
 		return $sHTMLValue;
@@ -186,7 +187,14 @@ class UILinksWidget
 			}
 			$oSet->AddObject($oObj);
 		}
-		cmdbAbstractObject::DisplaySet($oPage, $oSet, $sExtKeyToMe, true /*menu*/, false /*select*/, $iObjectId, $sExtKeyToRemote);
+		$aExtraParams = array();
+		$aExtraParams['link_attr'] = $sExtKeyToMe;
+		$aExtraParams['object_id'] = $iObjectId;
+		$aExtraParams['target_attr'] = $sExtKeyToRemote;
+		$aExtraParams['menu'] = false;
+		$aExtraParams['select'] = false;
+		
+		cmdbAbstractObject::DisplaySet($oPage, $oSet, $aExtraParams);
 	}