Merge branch 'modules'

This commit is contained in:
Etienne Roudeix
2013-11-14 12:04:20 +01:00
27 changed files with 866 additions and 321 deletions

View File

@@ -201,7 +201,7 @@ class BaseAdminController extends BaseController
$parser = $this->container->get("thelia.parser");
// Define the template that should be used
$parser->setTemplate($template ?: TemplateHelper::getInstance()->getActiveAdminTemplate()->getPath());
$parser->setTemplate($template ?: TemplateHelper::getInstance()->getActiveAdminTemplate());
return $parser;
}

View File

@@ -188,6 +188,24 @@ class ModuleController extends AbstractCrudController
return $this->render("modules");
}
public function configureAction($module_code)
{
$module = ModuleQuery::create()->findOneByCode($module_code);
if(null === $module) {
throw new \InvalidArgumentException(sprintf("Module `%s` does not exists", $module_code));
}
if (null !== $response = $this->checkAuth(array(), $module_code, AccessManager::VIEW)) return $response;
return $this->render(
"module-configure",
array(
"module_code" => $module_code,
)
);
}
public function toggleActivationAction($module_id)
{
if (null !== $response = $this->checkAuth(AdminResources::MODULE, array(), AccessManager::UPDATE)) return $response;