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

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

Browse Source 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
This commit is contained in:
mespeche
2013-09-16 11:01:00 +02:00
parent 15d9b55284 657456109b
commit 76dc9609b6
67 changed files with 5471 additions and 2489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,11 +67,21 @@
<tag name="kernel.event_subscriber"/>
</service>
<service id="thelia.action.feature" class="Thelia\Action\Feature">
<argument type="service" id="service_container"/>
<tag name="kernel.event_subscriber"/>
</service>
<service id="thelia.action.attributeav" class="Thelia\Action\AttributeAv">
<argument type="service" id="service_container"/>
<tag name="kernel.event_subscriber"/>
</service>
<service id="thelia.action.featureav" class="Thelia\Action\FeatureAv">
<argument type="service" id="service_container"/>
<tag name="kernel.event_subscriber"/>
</service>
<service id="thelia.action.httpException" class="Thelia\Action\HttpException">
<argument type="service" id="service_container"/>
<tag name="kernel.event_subscriber"/>

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

@@ -72,8 +72,13 @@
<form name="thelia.admin.attribute.creation" class="Thelia\Form\AttributeCreationForm"/>
<form name="thelia.admin.attribute.modification" class="Thelia\Form\AttributeModificationForm"/>
<form name="thelia.admin.feature.creation" class="Thelia\Form\FeatureCreationForm"/>
<form name="thelia.admin.feature.modification" class="Thelia\Form\FeatureModificationForm"/>
<form name="thelia.admin.attributeav.creation" class="Thelia\Form\AttributeAvCreationForm"/>
<form name="thelia.admin.featureav.creation" class="Thelia\Form\FeatureAvCreationForm"/>
<form name="thelia.admin.template.creation" class="Thelia\Form\TemplateCreationForm"/>
<form name="thelia.admin.template.modification" class="Thelia\Form\TemplateModificationForm"/>
@@ -235,6 +240,8 @@
<service id="thelia.constraint.factory" class="Thelia\Constraint\ConstraintFactory">
<argument type="service" id="service_container" />
</service>
<service id="thelia.constraint.validator" class="Thelia\Constraint\ConstraintValidator">
</service>
<service id="thelia.constraint.rule.available_for_everyone" class="Thelia\Constraint\Rule\AvailableForEveryoneManager">
<argument type="service" id="thelia.adapter" />
<tag name="thelia.coupon.addRule"/>

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

@@ -103,25 +103,27 @@
<!-- Route to the Coupon controller (process Coupon browsing) -->
<route id="admin.coupon.list" path="/admin/coupon">
<route id="admin.coupon.list" path="/admin/coupon/">
<default key="_controller">Thelia\Controller\Admin\CouponController::browseAction</default>
</route>
<route id="admin.coupon.create" path="/admin/coupon/create">
<route id="admin.coupon.create" path="/admin/coupon/create/">
<default key="_controller">Thelia\Controller\Admin\CouponController::createAction</default>
</route>
<route id="admin.coupon.update" path="/admin/coupon/update/{couponId}">
<route id="admin.coupon.update" path="/admin/coupon/update/{couponId}/">
<default key="_controller">Thelia\Controller\Admin\CouponController::updateAction</default>
</route>
<route id="admin.coupon.read" path="/admin/coupon/read/{couponId}">
<route id="admin.coupon.read" path="/admin/coupon/read/{couponId}/">
<default key="_controller">Thelia\Controller\Admin\CouponController::readAction</default>
</route>
<route id="admin.coupon.rule.input" path="/admin/coupon/rule/{ruleId}">
<route id="admin.coupon.rule.input" path="/admin/coupon/rule/{ruleId}/">
<default key="_controller">Thelia\Controller\Admin\CouponController::getRuleInputAction</default>
</route>
<route id="admin.coupon.rule.update" path="/admin/coupon/{couponId}/rule/update/">
<default key="_controller">Thelia\Controller\Admin\CouponController::updateRulesAction</default>
</route>
<route id="admin.coupon.consume" path="/admin/coupon/consume/{couponCode}/">
<default key="_controller">Thelia\Controller\Admin\CouponController::consumeAction</default>
</route>
<!-- Routes to the Config (system variables) controller -->
@@ -302,6 +304,63 @@
<!-- end countries routes management -->
<!-- feature and features value management -->
<route id="admin.configuration.features.default" path="/admin/configuration/features">
<default key="_controller">Thelia\Controller\Admin\FeatureController::defaultAction</default>
</route>
<route id="admin.configuration.features.create" path="/admin/configuration/features/create">
<default key="_controller">Thelia\Controller\Admin\FeatureController::createAction</default>
</route>
<route id="admin.configuration.features.update" path="/admin/configuration/features/update">
<default key="_controller">Thelia\Controller\Admin\FeatureController::updateAction</default>
</route>
<route id="admin.configuration.features.save" path="/admin/configuration/features/save">
<default key="_controller">Thelia\Controller\Admin\FeatureController::processUpdateAction</default>
</route>
<route id="admin.configuration.features.delete" path="/admin/configuration/features/delete">
<default key="_controller">Thelia\Controller\Admin\FeatureController::deleteAction</default>
</route>
<route id="admin.configuration.features.update-position" path="/admin/configuration/features/update-position">
<default key="_controller">Thelia\Controller\Admin\FeatureController::updatePositionAction</default>
</route>
<route id="admin.configuration.features.rem-from-all" path="/admin/configuration/features/remove-from-all-templates">
<default key="_controller">Thelia\Controller\Admin\FeatureController::removeFromAllTemplates</default>
</route>
<route id="admin.configuration.features.add-to-all" path="/admin/configuration/features/add-to-all-templates">
<default key="_controller">Thelia\Controller\Admin\FeatureController::addToAllTemplates</default>
</route>
<route id="admin.configuration.features-av.create" path="/admin/configuration/features-av/create">
<default key="_controller">Thelia\Controller\Admin\FeatureAvController::createAction</default>
</route>
<route id="admin.configuration.features-av.update" path="/admin/configuration/features-av/update">
<default key="_controller">Thelia\Controller\Admin\FeatureAvController::updateAction</default>
</route>
<route id="admin.configuration.features-av.save" path="/admin/configuration/features-av/save">
<default key="_controller">Thelia\Controller\Admin\FeatureAvController::processUpdateAction</default>
</route>
<route id="admin.configuration.features-av.delete" path="/admin/configuration/features-av/delete">
<default key="_controller">Thelia\Controller\Admin\FeatureAvController::deleteAction</default>
</route>
<route id="admin.configuration.features-av.update-position" path="/admin/configuration/features-av/update-position">
<default key="_controller">Thelia\Controller\Admin\FeatureAvController::updatePositionAction</default>
</route>
<!-- end feature and feature routes management -->
<!-- The default route, to display a template -->
<route id="admin.processTemplate" path="/admin/{template}">