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

// fix ajax-tab

Browse Source
This commit is contained in:
mMarinetti committed 2011-11-17 09:03:42 +00:00
1 parent 22cd141706
commit 5af5c8724f
2 files changed
+10 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/template/layout-ajax.tpl
+1 -1
View File
@@ -85,4 +85,4 @@
</div> </div>
{/if} {/if}
{$content} {$page}
classes/AdminController.php
+9 -5
View File
@@ -998,12 +998,16 @@ class AdminControllerCore extends Controller
$this->context->smarty->assign('content', $this->context->smarty->fetch($tpl_action)); $this->context->smarty->assign('content', $this->context->smarty->fetch($tpl_action));
} }
// Check if content template has been override if (!$this->ajax)
if (file_exists($this->context->smarty->template_dir[0].'/'.$tpl)) {
$page = $this->context->smarty->fetch($tpl); // Check if content template has been override
if (file_exists($this->context->smarty->template_dir[0].'/'.$tpl))
$page = $this->context->smarty->fetch($tpl);
else
$page = $this->context->smarty->fetch($this->template);
}
else else
$page = $this->context->smarty->fetch($this->template); $page = $this->content;
if ($conf = Tools::getValue('conf')) if ($conf = Tools::getValue('conf'))
$this->context->smarty->assign('conf', $this->_conf[(int)$conf]); $this->context->smarty->assign('conf', $this->_conf[(int)$conf]);