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

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

Browse Source 
Conflicts:
	core/lib/Thelia/Action/BaseAction.php
	core/lib/Thelia/Controller/Admin/AbstractSeoCrudController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Core/Event/UpdateSeoEvent.php
	core/lib/Thelia/Form/ProductModificationForm.php
	core/lib/Thelia/Form/SeoFieldsTrait.php
	core/lib/Thelia/Model/Base/Product.php
	core/lib/Thelia/Model/Base/ProductI18n.php
	core/lib/Thelia/Model/Base/ProductI18nQuery.php
	core/lib/Thelia/Model/Map/ProductI18nTableMap.php
	core/lib/Thelia/Model/Map/ProductTableMap.php
	install/thelia.sql
	local/config/schema.xml
	templates/backOffice/default/includes/product-general-tab.html
	templates/backOffice/default/includes/seo-tab.html
	templates/backOffice/default/product-edit.html
This commit is contained in:
touffies
2013-12-09 15:22:17 +01:00
parent cd0c3342e2 a375d942ec
commit 6648613772
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/lib/Thelia/Action/Product.php
View File

@@ -392,12 +392,13 @@ class Product extends BaseAction implements EventSubscriberInterface
public static function getSubscribedEvents() public static function getSubscribedEvents()
{ {
return array( return array(
TheliaEvents::PRODUCT_CREATE => array("create", 128), TheliaEvents::PRODUCT_CREATE => array("create", 128),
TheliaEvents::PRODUCT_UPDATE => array("update", 128), TheliaEvents::PRODUCT_UPDATE => array("update", 128),
TheliaEvents::PRODUCT_DELETE => array("delete", 128), TheliaEvents::PRODUCT_DELETE => array("delete", 128),
TheliaEvents::PRODUCT_TOGGLE_VISIBILITY => array("toggleVisibility", 128), TheliaEvents::PRODUCT_TOGGLE_VISIBILITY => array("toggleVisibility", 128),
TheliaEvents::PRODUCT_UPDATE_POSITION => array("updatePosition", 128), TheliaEvents::PRODUCT_UPDATE_POSITION => array("updatePosition", 128),
TheliaEvents::PRODUCT_UPDATE_SEO => array("updateSeo", 128),
TheliaEvents::PRODUCT_ADD_CONTENT => array("addContent", 128), TheliaEvents::PRODUCT_ADD_CONTENT => array("addContent", 128),
TheliaEvents::PRODUCT_REMOVE_CONTENT => array("removeContent", 128), TheliaEvents::PRODUCT_REMOVE_CONTENT => array("removeContent", 128),
@@ -407,13 +408,13 @@ class Product extends BaseAction implements EventSubscriberInterface
TheliaEvents::PRODUCT_REMOVE_ACCESSORY => array("removeAccessory", 128), TheliaEvents::PRODUCT_REMOVE_ACCESSORY => array("removeAccessory", 128),
TheliaEvents::PRODUCT_UPDATE_ACCESSORY_POSITION => array("updateAccessoryPosition", 128), TheliaEvents::PRODUCT_UPDATE_ACCESSORY_POSITION => array("updateAccessoryPosition", 128),
TheliaEvents::PRODUCT_ADD_CATEGORY => array("addCategory", 128), TheliaEvents::PRODUCT_ADD_CATEGORY => array("addCategory", 128),
TheliaEvents::PRODUCT_REMOVE_CATEGORY => array("removeCategory", 128), TheliaEvents::PRODUCT_REMOVE_CATEGORY => array("removeCategory", 128),
TheliaEvents::PRODUCT_SET_TEMPLATE => array("setProductTemplate", 128), TheliaEvents::PRODUCT_SET_TEMPLATE => array("setProductTemplate", 128),
TheliaEvents::PRODUCT_FEATURE_UPDATE_VALUE => array("updateFeatureProductValue", 128), TheliaEvents::PRODUCT_FEATURE_UPDATE_VALUE => array("updateFeatureProductValue", 128),
TheliaEvents::PRODUCT_FEATURE_DELETE_VALUE => array("deleteFeatureProductValue", 128), TheliaEvents::PRODUCT_FEATURE_DELETE_VALUE => array("deleteFeatureProductValue", 128),
); );
} }
} }