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

// fix ajax-tab

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10195 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-11-17 09:03:42 +00:00
parent 41b256f637
commit fe5fe7f3db
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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]);