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

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

Browse Source 
# By Manuel Raynaud (2) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Completed mailing templates management
  change symfony/icu version for compatibility
  add file reset_install.sh

Conflicts:
	composer.json
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Model/Map/CouponI18nTableMap.php
	install/thelia.sql
	local/config/schema.xml
	reset_install.sh
This commit is contained in:
gmorel
2013-09-02 17:25:25 +02:00
parent 451dc93eb3 3191a928ab
commit 33b8ceb24e
166 changed files with 2213 additions and 867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -34,6 +34,7 @@
<loop class="Thelia\Core\Template\Loop\Image" name="image"/>
<loop class="Thelia\Core\Template\Loop\Config" name="config"/>
<loop class="Thelia\Core\Template\Loop\Coupon" name="coupon"/>
<loop class="Thelia\Core\Template\Loop\Message" name="message"/>
</loops>
<forms>
@@ -50,6 +51,9 @@
<form name="thelia.admin.config.creation" class="Thelia\Form\ConfigCreationForm"/>
<form name="thelia.admin.config.modification" class="Thelia\Form\ConfigModificationForm"/>
<form name="thelia.admin.message.creation" class="Thelia\Form\MessageCreationForm"/>
<form name="thelia.admin.message.modification" class="Thelia\Form\MessageModificationForm"/>
</forms>

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

@@ -94,6 +94,27 @@
<default key="_controller">Thelia\Controller\Admin\ConfigController::deleteAction</default>
</route>
<!-- Routes to the Messages controller -->
<route id="admin.configuration.messages.default" path="/admin/configuration/messages">
<default key="_controller">Thelia\Controller\Admin\MessageController::defaultAction</default>
</route>
<route id="admin.configuration.messages.create" path="/admin/configuration/messages/create">
<default key="_controller">Thelia\Controller\Admin\MessageController::createAction</default>
</route>
<route id="admin.configuration.messages.change" path="/admin/configuration/messages/change">
<default key="_controller">Thelia\Controller\Admin\MessageController::changeAction</default>
</route>
<route id="admin.configuration.messages.save-change" path="/admin/configuration/messages/save-change">
<default key="_controller">Thelia\Controller\Admin\MessageController::saveChangeAction</default>
</route>
<route id="admin.configuration.messages.delete" path="/admin/configuration/messages/delete">
<default key="_controller">Thelia\Controller\Admin\MessageController::deleteAction</default>
</route>
<!-- The default route, to display a template -->