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

Merge branch 'master' into tax

Browse Source
This commit is contained in:
Etienne Roudeix
2013-10-23 16:32:10 +02:00
parent fb8b82093a 3dd51d98b6
commit cf67a0478e
25 changed files with 1469 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/lib/Thelia/Config/Resources/action.xml
View File

@@ -165,6 +165,11 @@
<argument type="service" id="service_container"/>
<tag name="kernel.event_subscriber"/>
</service>
<service id="thelia.action.lang" class="Thelia\Action\Lang">
<argument type="service" id="service_container"/>
<tag name="kernel.event_subscriber"/>
</service>
</services>
</config>

6
core/lib/Thelia/Config/Resources/config.xml
View File

@@ -141,8 +141,6 @@
<form name="thelia.admin.country.creation" class="Thelia\Form\CountryCreationForm"/>
<form name="thelia.admin.country.modification" class="Thelia\Form\CountryModificationForm"/>
<form name="thelia.admin.language.creation" class="Thelia\Form\LanguageCreationForm"/>
<form name="thelia.admin.area.create" class="Thelia\Form\Area\AreaCreateForm"/>
<form name="thelia.admin.area.modification" class="Thelia\Form\Area\AreaModificationForm"/>
@@ -154,6 +152,10 @@
<form name="thelia.contact" class="Thelia\Form\ContactForm"/>
<form name="thelia.newsletter" class="Thelia\Form\NewsletterForm"/>
<form name="thelia.lang.update" class="Thelia\Form\Lang\LangUpdateForm"/>
<form name="thelia.lang.create" class="Thelia\Form\Lang\LangCreateForm"/>
<form name="thelia.lang.defaultBehavior" class="Thelia\Form\Lang\LangDefaultBehaviorForm"/>
</forms>

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

@@ -933,6 +933,39 @@
<!-- end tax rules management -->
<!-- language management -->
<route id="admin.configuration.languages" path="/admin/configuration/languages">
<default key="_controller">Thelia\Controller\Admin\LangController::defaultAction</default>
</route>
<route id="admin.configuration.languages.update" path="/admin/configuration/languages/update/{lang_id}">
<default key="_controller">Thelia\Controller\Admin\LangController::updateAction</default>
<requirement key="lang_id">\d+</requirement>
</route>
<route id="admin.configuration.languages.update.process" path="/admin/configuration/languages/save/{lang_id}">
<default key="_controller">Thelia\Controller\Admin\LangController::processUpdateAction</default>
<requirement key="lang_id">\d+</requirement>
</route>
<route id="admin.configuration.languages.toggleDefault" path="/admin/configuration/languages/toggleDefault/{lang_id}">
<default key="_controller">Thelia\Controller\Admin\LangController::toggleDefaultAction</default>
<requirement key="lang_id">\d+</requirement>
</route>
<route id="admin.configuration.languages.add" path="/admin/configuration/languages/add">
<default key="_controller">Thelia\Controller\Admin\LangController::addAction</default>
</route>
<route id="admin.configuration.languages.delete" path="/admin/configuration/languages/delete">
<default key="_controller">Thelia\Controller\Admin\LangController::deleteAction</default>
</route>
<route id="admin.configuration.languages.defaultBehavior" path="/admin/configuration/languages/defaultBehavior">
<default key="_controller">Thelia\Controller\Admin\LangController::defaultBehaviorAction</default>
</route>
<!-- The default route, to display a template -->