summaryrefslogtreecommitdiff
path: root/framework/Web/UI/WebControls/TTemplateColumn.php
diff options
context:
space:
mode:
Diffstat (limited to 'framework/Web/UI/WebControls/TTemplateColumn.php')
-rw-r--r--framework/Web/UI/WebControls/TTemplateColumn.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/framework/Web/UI/WebControls/TTemplateColumn.php b/framework/Web/UI/WebControls/TTemplateColumn.php
index bd3a2acb..377fadfc 100644
--- a/framework/Web/UI/WebControls/TTemplateColumn.php
+++ b/framework/Web/UI/WebControls/TTemplateColumn.php
@@ -194,9 +194,11 @@ class TTemplateColumn extends TDataGridColumn
{
if($itemType===TListItemType::EditItem)
{
- $template=$this->_editItemTemplate===null?$this->_itemTemplate:$this->_editItemTemplate;
- if(($classPath=$this->getEditItemRenderer())==='')
+ if(($classPath=$this->getEditItemRenderer())==='' && ($template=$this->_editItemTemplate)===null)
+ {
$classPath=$this->getItemRenderer();
+ $template=$this->_itemTemplate;
+ }
}
else
{
@@ -236,7 +238,7 @@ class TTemplateColumn extends TDataGridColumn
else if($this->_footerTemplate!==null)
$this->_footerTemplate->instantiateIn($cell);
else
- $this->initializeHeaderCell($cell,$columnIndex);
+ $this->initializeFooterCell($cell,$columnIndex);
}
}