Fixed #197

3 files changed, 9 insertions, 2 deletions

diff --git a/HISTORY b/HISTORY
index 6132bbf8..1eec7319 100644
--- a/HISTORY
+++ b/HISTORY
@@ -12,6 +12,7 @@ BUG: Ticket#200 - onClick javascript event triggered twice on CheckBox label (Qi
 ENH: Ticket#150 - TDataGrid and TDataList now render table section tags (Qiang)

 ENH: Ticket#152 - constituent parts of TWizard are exposed (Qiang)

 ENH: Ticket#184 - added TUserManager.Users and Roles properties (Qiang)

+ENH: Ticket#197 - sanity check for datagrid header and footer (Qiang)

 ENH: added sanity check to calling event handlers (Qiang)

 ENH: added search for quickstart tutorials (Wei)

 ENH: added support to property tags for template owner control (Qiang)

diff --git a/demos/blog/protected/Pages/Posts/ListPost.page b/demos/blog/protected/Pages/Posts/ListPost.page
index 4c96d6fb..1371a5ab 100644
--- a/demos/blog/protected/Pages/Posts/ListPost.page
+++ b/demos/blog/protected/Pages/Posts/ListPost.page
@@ -3,6 +3,12 @@
 <com:TPanel ID="CategoryPanel" Visible="false" CssClass="category">

 <div class="category-name">

 <%= $this->Category->Name %>

+<com:THyperLink

+	Text="[#]"

+	Tooltip="Edit this category"

+	Visible=<%= $this->User->IsAdmin %>

+	NavigateUrl=<%= $this->Service->constructUrl('Posts.EditCategory',array('id'=>$this->Category->ID)) %>

+	/>

 <com:TLinkButton

 	Text="[-]"

 	Tooltip="Delete this category"

diff --git a/framework/Web/UI/WebControls/TDataGrid.php b/framework/Web/UI/WebControls/TDataGrid.php
index 6ff6faba..82c243ca 100644
--- a/framework/Web/UI/WebControls/TDataGrid.php
+++ b/framework/Web/UI/WebControls/TDataGrid.php
@@ -1523,7 +1523,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 	protected function renderTable($writer)

 	{

 		$this->renderBeginTag($writer);

-		if($this->_header->getVisible())

+		if($this->_header && $this->_header->getVisible())

 		{

 			$writer->writeLine();

 			$writer->renderBeginTag('thead');

@@ -1536,7 +1536,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer
 			$item->renderControl($writer);

 		$writer->renderEndTag();

 

-		if($this->_footer->getVisible())

+		if($this->_footer && $this->_footer->getVisible())

 		{

 			$writer->writeLine();

 			$writer->renderBeginTag('tfoot');