fix modules bug
This commit is contained in:
@@ -24,6 +24,7 @@
|
|||||||
namespace Thelia\Core\Template\Loop;
|
namespace Thelia\Core\Template\Loop;
|
||||||
|
|
||||||
use Propel\Runtime\ActiveQuery\Criteria;
|
use Propel\Runtime\ActiveQuery\Criteria;
|
||||||
|
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
|
||||||
use Thelia\Core\Security\AccessManager;
|
use Thelia\Core\Security\AccessManager;
|
||||||
use Thelia\Core\Template\Element\BaseI18nLoop;
|
use Thelia\Core\Template\Element\BaseI18nLoop;
|
||||||
use Thelia\Core\Template\Element\LoopResult;
|
use Thelia\Core\Template\Element\LoopResult;
|
||||||
@@ -149,13 +150,19 @@ class Module extends BaseI18nLoop implements PropelSearchLoopInterface
|
|||||||
->set("POSITION", $module->getPosition());
|
->set("POSITION", $module->getPosition());
|
||||||
|
|
||||||
$hasConfigurationInterface = false;
|
$hasConfigurationInterface = false;
|
||||||
$routerId = "router." . $module->getBaseDir();
|
|
||||||
/* first test if module defines it's own config route */
|
/* first test if module defines it's own config route */
|
||||||
|
$routerId = "router." . $module->getBaseDir();
|
||||||
if($this->container->has($routerId)) {
|
if($this->container->has($routerId)) {
|
||||||
if($this->container->get($routerId)->match('/admin/module/' . $module->getCode())) {
|
try {
|
||||||
$hasConfigurationInterface = true;
|
if($this->container->get($routerId)->match('/admin/module/' . $module->getCode())) {
|
||||||
|
$hasConfigurationInterface = true;
|
||||||
|
}
|
||||||
|
} catch(ResourceNotFoundException $e) {
|
||||||
|
/* $hasConfigurationInterface stays false */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* if not ; test if it uses admin inclusion : module_configuration.html */
|
/* if not ; test if it uses admin inclusion : module_configuration.html */
|
||||||
if(false === $hasConfigurationInterface) {
|
if(false === $hasConfigurationInterface) {
|
||||||
if(file_exists( sprintf("%s/%s/AdminIncludes/%s.html", THELIA_MODULE_DIR, $module->getBaseDir(), "module_configuration"))) {
|
if(file_exists( sprintf("%s/%s/AdminIncludes/%s.html", THELIA_MODULE_DIR, $module->getBaseDir(), "module_configuration"))) {
|
||||||
|
|||||||
Reference in New Issue
Block a user