All the overloads of DisplayBareProperties must return an array (otherwise a warning is issued and field validation will not work as expected)

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

application/query.class.inc.php

@@ -88,7 +88,7 @@ class QueryOQL extends Query
 
 	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
 	{
-		parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
+		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
 		
 		if (!$bEditMode)
 		{
@@ -102,6 +102,7 @@ class QueryOQL extends Query
 			}
 			$oPage->p(Dict::S('UI:Query:UrlForExcel').':<br/><textarea cols="80" rows="3" READONLY>'.$sUrl.'</textarea>');		
 		}
+		return $aFieldsMap;
 	}
 }
 

application/shortcut.class.inc.php

@@ -142,6 +142,7 @@ EOF
 
 	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
 	{
+		return array();
 	}
 	// End of the minimal implementation of iDisplay
 }

core/event.class.inc.php

@@ -107,7 +107,7 @@ class Event extends DBObject implements iDisplay
 	
 	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
 	{
-		if ($bEditMode) return; // Not editable
+		if ($bEditMode) return array(); // Not editable
 		
 		$aDetails = array();
 		$sClass = get_class($this);
@@ -118,6 +118,7 @@ class Event extends DBObject implements iDisplay
 			$aDetails[] = array('label' => '<span title="'.MetaModel::GetDescription($sClass, $sAttCode).'">'.MetaModel::GetLabel($sClass, $sAttCode).'</span>', 'value' => $sDisplayValue);
 		}
 		$oPage->Details($aDetails);
+		return array();
 	}
 }
 

datamodels/1.x/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml

@@ -1277,7 +1277,7 @@
           <type>Overload-cmdbAbstractObject</type>
           <code><![CDATA[	public function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
 	{
-		parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
+		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
 		if (!$bEditMode)
 		{
 			$oPage->add('<fieldset>');
@@ -1285,6 +1285,7 @@
 			$oPage->add($this->DisplayDocumentInline($oPage, 'contents'));
 			$oPage->add('</fieldset>');
 		}
+		return $aFieldsMap;
 	}]]></code>
         </method>
       </methods>

datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml

@@ -982,7 +982,7 @@
 	]]></comment>
           <code><![CDATA[public function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
 	{
-		parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
+		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
 		if (!$bEditMode)
 		{
 			$oPage->add('<fieldset>');
@@ -990,6 +990,7 @@
 			$oPage->add($this->DisplayDocumentInline($oPage, 'file'));
 			$oPage->add('</fieldset>');
 		}
+		return $aFieldsMap;
 	}]]></code>
         </method>
       </methods>

synchro/synchrodatasource.class.inc.php

@@ -105,7 +105,7 @@ class SynchroDataSource extends cmdbAbstractObject
 		{
 			$this->Set('database_table_name', $this->GetDataTable());
 		}
-		parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
+		return parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
 	}
 		
 	public function DisplayBareRelations(WebPage $oPage, $bEditMode = false)