merge from 3.0 branch till 1387

1 files changed, 19 insertions, 0 deletions

diff --git a/framework/Web/UI/WebControls/TListControl.php b/framework/Web/UI/WebControls/TListControl.php
index 76c59903..3a0a4f76 100644
--- a/framework/Web/UI/WebControls/TListControl.php
+++ b/framework/Web/UI/WebControls/TListControl.php
@@ -195,6 +195,7 @@ abstract class TListControl extends TDataBoundControl
 		if($valueField==='')

 			$valueField=1;

 		$textFormat=$this->getDataTextFormatString();

+		$groupField=$this->getDataGroupField();

 		foreach($data as $key=>$object)

 		{

 			$item=$items->createListItem();

@@ -203,6 +204,8 @@ abstract class TListControl extends TDataBoundControl
 				$text=TDataFieldAccessor::getDataFieldValue($object,$textField);

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

 				$item->setValue($value);

+				if($groupField!=='')

+					$item->setAttribute('Group',TDataFieldAccessor::getDataFieldValue($object,$groupField));

 			}

 			else

 			{

@@ -396,6 +399,22 @@ abstract class TListControl extends TDataBoundControl
 	}

 

 	/**

+	 * @return string the field of the data source that provides the label of the list item groups

+	 */

+	public function getDataGroupField()

+	{

+		return $this->getViewState('DataGroupField','');

+	}

+

+	/**

+	 * @param string the field of the data source that provides the label of the list item groups

+	 */

+	public function setDataGroupField($value)

+	{

+		$this->setViewState('DataGroupField',$value,'');

+	}

+

+	/**

 	 * @return integer the number of items in the list control

 	 */

 	public function getItemCount()