TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'backoffice' into frontend

Browse Source
This commit is contained in:
touffies
2013-11-25 10:24:29 +01:00
parent 743f894a4c 7f1c1bfdd8
commit fd0301022d
17 changed files with 455 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/lib/Thelia/Config/Resources/form.xml
View File

@@ -118,6 +118,7 @@
<form name="thelia.lang.defaultBehavior" class="Thelia\Form\Lang\LangDefaultBehaviorForm"/>
<form name="thelia.lang.url" class="Thelia\Form\Lang\LangUrlForm"/>
<form name="thelia.configuration.store" class="Thelia\Form\ConfigStoreForm"/>
<form name="thelia.system-logs.configuration" class="Thelia\Form\SystemLogConfigurationForm"/>
<form name="thelia.admin.module.modification" class="Thelia\Form\ModuleModificationForm"/>

11
core/lib/Thelia/Config/Resources/routing/admin.xml
View File

@@ -512,6 +512,17 @@
<default key="_controller">Thelia\Controller\Admin\ConfigController::deleteAction</default>
</route>
<!-- Routes to the ConfigStore controller -->
<route id="admin.configuration.store.default" path="/admin/configuration/store">
<default key="_controller">Thelia\Controller\Admin\ConfigStoreController::defaultAction</default>
</route>
<route id="admin.configuration.store.save" path="/admin/configuration/store/save">
<default key="_controller">Thelia\Controller\Admin\ConfigStoreController::saveAction</default>
</route>
<!-- Routes to the SystemLog controller -->
<route id="admin.configuration.system-logs.default" path="/admin/configuration/system-logs">