Fixed a bug that TDataGrid may complain getting ItemType on a non-object if the grid is not data-bound

1 files changed, 10 insertions, 2 deletions

diff --git a/framework/Web/UI/WebControls/TDataGrid.php b/framework/Web/UI/WebControls/TDataGrid.php
index fead5344..ab956d9c 100644
--- a/framework/Web/UI/WebControls/TDataGrid.php
+++ b/framework/Web/UI/WebControls/TDataGrid.php
@@ -213,7 +213,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 		if($object instanceof TDataGridColumn)

 			$this->getColumns()->add($object);

 		else

-			parent::addParsedObject($object);

+			parent::addParsedObject($object);  // this is needed by EmptyTemplate

 	}

 

 	/**

@@ -247,6 +247,14 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 	}

 

 	/**

+	 * @return integer number of items

+	 */

+	public function getItemCount()

+	{

+		return $this->_items?$this->_items->getCount():0;

+	}

+

+	/**

 	 * Creates a style object for the control.

 	 * This method creates a {@link TTableStyle} to be used by datagrid.

 	 * @return TTableStyle control style to be used

@@ -1423,7 +1431,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 				$this->renderContents($writer);

 				$control->renderEndTag($writer);

 			}

-			else

+			else if($this->getViewState('ItemCount',0)>0)

 			{

 				$this->applyItemStyles();

 				if($this->_topPager)