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

// fix update view.tpl in AdminManufacturersController

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9915 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-11-07 09:12:51 +00:00
parent c62eb897a5
commit edb2da2600
5 changed files with 127 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
classes/AdminController.php
View File

@@ -1008,17 +1008,17 @@ class AdminControllerCore extends Controller
// Template override
$tpl = $this->tpl_folder.'content.tpl';
//$tpl_action = $this->tpl_folder.$this->display.'.tpl';
$tpl_action = $this->tpl_folder.$this->display.'.tpl';
// Check if action template has been override
// new smarty : template_dir is an array.
// @todo : add override path to the smarty config, and checking all array item
/*if (file_exists($this->context->smarty->template_dir[0].'/'.$tpl_action))
if (file_exists($this->context->smarty->template_dir[0].'/'.$tpl_action) && $this->display != 'view')
{
if (method_exists($this, $this->display.Tools::toCamelCase($this->className)))
$this->{$this->display.Tools::toCamelCase($this->className)}();
$this->context->smarty->assign('content', $this->context->smarty->fetch($tpl_action));
}*/
}
// Check if content template has been override
if (file_exists($this->context->smarty->template_dir[0].'/'.$tpl))
@@ -1253,14 +1253,14 @@ class AdminControllerCore extends Controller
return;
$this->content .= $this->initForm();
}
elseif ($this->display == 'view')
else if ($this->display == 'view')
{
// Some controllers use the view action without an object
if ($this->className)
$this->loadObject(true);
$this->content .= $this->initView();
}
elseif (!$this->ajax)
else if (!$this->ajax)
{
$this->content .= $this->initList();
$this->content .= $this->initOptions();