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

Conflicts: core/lib/Thelia/Model/Product.php
2013-09-17 23:51:31 +02:00
parent 1e15142283 da7f9e07c4
commit de4767ef56
27 changed files with 995 additions and 543 deletions
--- a/core/lib/Thelia/Action/Product.php
+++ b/core/lib/Thelia/Action/Product.php
@@ -40,6 +40,7 @@ use Thelia\Core\Event\ProductAddContentEvent;
 use Thelia\Core\Event\ProductDeleteContentEvent;
 use Thelia\Model\ProductAssociatedContent;
 use Thelia\Model\ProductAssociatedContentQuery;
+use Thelia\Model\ProductCategory;

 class Product extends BaseAction implements EventSubscriberInterface
 {
@@ -55,13 +56,13 @@ class Product extends BaseAction implements EventSubscriberInterface
        $product
            ->setDispatcher($this->getDispatcher())

-            ->setLocale($event->getLocale())
+            ->setRef($event->getRef())
            ->setTitle($event->getTitle())
-            ->setParent($event->getParent())
+            ->setLocale($event->getLocale())
            ->setVisible($event->getVisible())

-            ->save()
-        ;
+            ->create($event->getDefaultCategory())
+         ;

        $event->setProduct($product);
    }