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

Merge branch 'master' of github.com:thelia/thelia

Browse Source
This commit is contained in:
Etienne Roudeix
2013-10-31 11:20:42 +01:00
parent f90df03f7d 5be233c079
commit e5f5570d2b
44 changed files with 1059 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,6 +90,8 @@
<form name="thelia.admin.product_sale_element.update" class="Thelia\Form\ProductSaleElementUpdateForm"/>
<form name="thelia.admin.product_default_sale_element.update" class="Thelia\Form\ProductDefaultSaleElementUpdateForm"/>
<form name="thelia.admin.product_combination.build" class="Thelia\Form\ProductCombinationGenerationForm"/>
<form name="thelia.admin.product.deletion" class="Thelia\Form\ProductModificationForm"/>
@@ -182,6 +184,7 @@
<command class="Thelia\Command\CreateAdminUser"/>
<command class="Thelia\Command\ReloadDatabaseCommand"/>
<command class="Thelia\Command\GenerateResources"/>
<command class="Thelia\Command\AdminUpdatePasswordCommand"/>
</commands>
<services>
@@ -208,7 +211,7 @@
<!-- Translation and internationalisation -->
<service id="thelia.translator" class="Thelia\Core\Translation\Translator">
<argument type="string" id="en_UK"></argument>
<argument>null</argument>
</service>
<!-- Security context for front and back office -->

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

@@ -384,6 +384,10 @@
<default key="_controller">Thelia\Controller\Admin\ProductController::updateProductSaleElementsAction</default>
</route>
<route id="admin.product.combination.build" path="/admin/product/combination/build">
<default key="_controller">Thelia\Controller\Admin\ProductController::buildCombinationsAction</default>
</route>
<route id="admin.product.combination.defaut-price.update" path="/admin/product/default-price/update">
<default key="_controller">Thelia\Controller\Admin\ProductController::updateProductDefaultSaleElementAction</default>
</route>