dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// ajax mode now uses layout-ajax.tpl by default

Browse Source
This commit is contained in:
mMarinetti
2011-11-16 14:48:24 +00:00
parent 3e0bb0ba0c
commit f46e38220c
2 changed files with 101 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+13 -15
View File
@@ -956,7 +956,8 @@ class AdminControllerCore extends Controller
public function displayAjax()
{
echo $this->content;
$this->layout = 'layout-ajax.tpl';
return $this->display();
}
public function display()
@@ -984,21 +985,18 @@ 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
{
if ($conf = Tools::getValue('conf'))
$this->context->smarty->assign('conf', $this->_conf[(int)$conf]);
$this->context->smarty->assign('errors', $this->_errors);
$this->context->smarty->assign('warnings', $this->warnings);
$this->context->smarty->assign('informations', $this->informations);
$this->context->smarty->assign('confirmations', $this->confirmations);
// page & layout if content_only = 1
$this->context->smarty->assign('page', $page);
$this->context->smarty->display($this->layout);
}
if ($conf = Tools::getValue('conf'))
$this->context->smarty->assign('conf', $this->_conf[(int)$conf]);
$this->context->smarty->assign('errors', $this->_errors);
$this->context->smarty->assign('warnings', $this->warnings);
$this->context->smarty->assign('informations', $this->informations);
$this->context->smarty->assign('confirmations', $this->confirmations);
$this->context->smarty->assign('page', $page);
$this->context->smarty->display($this->layout);
}
/**