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

[*] MO : Templates overrides works with the new structure (/views/templates/admin|front|hook)

Browse Source
This commit is contained in:
Francois Gaillard committed 2013-08-01 19:10:25 +02:00
1 parent ac48c1b786
commit 28de7890d2
3 files changed
+11 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/controller/ModuleAdminController.php
+2
View File
@@ -64,6 +64,8 @@ abstract class ModuleAdminControllerCore extends AdminController
*/ */
public function getTemplatePath() public function getTemplatePath()
{ {
if (file_exists(_PS_THEME_DIR_.'modules/'.$this->name.'/views/templates/admin/'.$template))
return _PS_THEME_DIR_.'modules/'.$this->name.'/views/templates/admin/'.$template;
return _PS_MODULE_DIR_.$this->module->name.'/views/templates/admin/'; return _PS_MODULE_DIR_.$this->module->name.'/views/templates/admin/';
} }
} }
classes/controller/ModuleFrontController.php
+2
View File
@@ -68,6 +68,8 @@ class ModuleFrontControllerCore extends FrontController
*/ */
public function getTemplatePath() public function getTemplatePath()
{ {
if (file_exists(_PS_THEME_DIR_.'modules/'.$this->name.'/views/templates/front/'.$template))
return _PS_THEME_DIR_.'modules/'.$this->name.'/views/templates/front/'.$template;
return _PS_MODULE_DIR_.$this->module->name.'/views/templates/front/'; return _PS_MODULE_DIR_.$this->module->name.'/views/templates/front/';
} }
} }
classes/module/Module.php
+7 -2
View File
@@ -1603,7 +1603,11 @@ abstract class ModuleCore
protected static function _isTemplateOverloadedStatic($module_name, $template) protected static function _isTemplateOverloadedStatic($module_name, $template)
{ {
if (Tools::file_exists_cache(_PS_THEME_DIR_.'modules/'.$module_name.'/'.$template)) if (Tools::file_exists_cache(_PS_THEME_DIR_.'modules/'.$module_name.'/'.$template))
return true; return _PS_THEME_DIR_.'modules/'.$module_name.'/'.$template;
elseif (Tools::file_exists_cache(_PS_THEME_DIR_.'modules/'.$module_name.'/views/templates/hook/'.$template))
return _PS_THEME_DIR_.'modules/'.$module_name.'/views/templates/hook/'.$template;
elseif (Tools::file_exists_cache(_PS_THEME_DIR_.'modules/'.$module_name.'/views/templates/front/'.$template))
return _PS_THEME_DIR_.'modules/'.$module_name.'/views/templates/front/'.$template;
elseif (Tools::file_exists_cache(_PS_MODULE_DIR_.$module_name.'/views/templates/hook/'.$template)) elseif (Tools::file_exists_cache(_PS_MODULE_DIR_.$module_name.'/views/templates/hook/'.$template))
return false; return false;
elseif (Tools::file_exists_cache(_PS_MODULE_DIR_.$module_name.'/'.$template)) elseif (Tools::file_exists_cache(_PS_MODULE_DIR_.$module_name.'/'.$template))
@@ -1664,8 +1668,9 @@ abstract class ModuleCore
$overloaded = $this->_isTemplateOverloaded($template); $overloaded = $this->_isTemplateOverloaded($template);
if ($overloaded === null) if ($overloaded === null)
return null; return null;
if ($overloaded) if ($overloaded)
return _PS_THEME_DIR_.'modules/'.$this->name.'/'.$template; return $overloaded;
else if (file_exists(_PS_MODULE_DIR_.$this->name.'/views/templates/hook/'.$template)) else if (file_exists(_PS_MODULE_DIR_.$this->name.'/views/templates/hook/'.$template))
return _PS_MODULE_DIR_.$this->name.'/views/templates/hook/'.$template; return _PS_MODULE_DIR_.$this->name.'/views/templates/hook/'.$template;
else else