// Change display_header and display_footer behavior on BackOffice

This commit is contained in:
rGaillard
2011-10-28 12:58:13 +00:00
parent 2a0bab6958
commit 737ba0736d
2 changed files with 13 additions and 7 deletions
+2 -4
View File
@@ -816,7 +816,7 @@ class AdminControllerCore extends Controller
$this->context->smarty->assign('display_header', $this->display_header);
$this->context->smarty->assign('display_footer', $this->display_footer);
$this->context->smarty->assign('meta_title', $this->meta_title);
// Template override
$tpl = $this->tpl_folder.'content.tpl';
$tpl_action = $this->tpl_folder.$this->display.'.tpl';
@@ -832,7 +832,6 @@ class AdminControllerCore extends Controller
$page = $this->context->smarty->fetch($tpl);
else
$page = $this->context->smarty->fetch($this->template);
if ($this->content_only)
echo $page;
else
@@ -1070,12 +1069,11 @@ class AdminControllerCore extends Controller
return;
$this->content .= $this->initForm();
}
else if ($this->display != 'view')
elseif ($this->display != 'view' && !$this->ajax)
{
$this->content .= $this->initList();
$this->content .= $this->initOptions();
}
$this->context->smarty->assign(array(
'table' => $this->table,
'current' => self::$currentIndex,