TDataFieldAccessor is used consistently to access all data field values.

2 files changed, 12 insertions, 18 deletions

diff --git a/framework/Web/UI/WebControls/TBaseDataList.php b/framework/Web/UI/WebControls/TBaseDataList.php
index c68be5f9..b7c79cbe 100644
--- a/framework/Web/UI/WebControls/TBaseDataList.php
+++ b/framework/Web/UI/WebControls/TBaseDataList.php
@@ -216,17 +216,7 @@ abstract class TBaseDataList extends TDataBoundControl
 	 */

 	protected function getDataFieldValue($data,$field)

 	{

-		if(is_array($data))

-			return $data[$field];

-		else if(($data instanceof TMap) || ($data instanceof TList))

-			return $data->itemAt($field);

-		else if(($data instanceof TComponent) && $data->canGetProperty($field))

-		{

-			$getter='get'.$field;

-			return $data->$getter();

-		}

-		else

-			throw new TInvalidDataValueException('basedatalist_datafield_invalid');

+		return TDataFieldAccessor::getDataFieldValue($data,$field);

 	}

 

 	/**

diff --git a/framework/Web/UI/WebControls/TListControl.php b/framework/Web/UI/WebControls/TListControl.php
index 55a46171..67f5555a 100644
--- a/framework/Web/UI/WebControls/TListControl.php
+++ b/framework/Web/UI/WebControls/TListControl.php
@@ -161,15 +161,19 @@ abstract class TListControl extends TDataBoundControl
 		foreach($data as $key=>$object)

 		{

 			$item=new TListItem;

-			if(!is_string($object) && isset($object[$textField]))

-				$text=$object[$textField];

+			if(is_array($object) || is_object($object))

+			{

+				$text=TDataFieldAccessor::getDataFieldValue($object,$textField);

+				$value=TDataFieldAccessor::getDataFieldValue($object,$valueField);

+				$item->setValue($value);

+			}

 			else

-				$text=TPropertyValue::ensureString($object);

+			{

+				$text=$object;

+				if(is_string($key))

+					$item->setValue($key);

+			}

 			$item->setText($textFormat===''?$text:sprintf($textFormat,$text));

-			if(!is_string($object) && isset($object[$valueField]))

-				$item->setValue($object[$valueField]);

-			else if(!is_integer($key))

-				$item->setValue($key);

 			$items->add($item);

 		}

 	}