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

Merge branch 'master' into rewrite

Browse Source 
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
	install/insert.sql
This commit is contained in:
Etienne Roudeix
2013-09-04 10:06:22 +02:00
parent 29bf7d9a92 1b7a36addf
commit dffbf76cfd
27 changed files with 472 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,6 +101,14 @@
<default key="_controller">Thelia\Controller\Admin\CurrencyController::saveChangeAction</default>
</route>
<route id="admin.configuration.currencies.set-default" path="/admin/configuration/currencies/set-default">
<default key="_controller">Thelia\Controller\Admin\CurrencyController::setDefaultAction</default>
</route>
<route id="admin.configuration.currencies.update-rates" path="/admin/configuration/currencies/update-rates">
<default key="_controller">Thelia\Controller\Admin\CurrencyController::updateRatesAction</default>
</route>
<route id="admin.configuration.currencies.delete" path="/admin/configuration/currencies/delete">
<default key="_controller">Thelia\Controller\Admin\CurrencyController::deleteAction</default>
</route>