Fix root option on TaxonChoiceType

ezecosystem · Jan 30, 2017 · 8e9a2bb · 8e9a2bb
1 parent f563c74
commit 8e9a2bb
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 14 deletions.
diff --git a/src/Sylius/Bundle/TaxonomyBundle/Doctrine/ORM/TaxonRepository.php b/src/Sylius/Bundle/TaxonomyBundle/Doctrine/ORM/TaxonRepository.php
@@ -12,7 +12,6 @@
 namespace Sylius\Bundle\TaxonomyBundle\Doctrine\ORM;
 
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
-use Sylius\Component\Taxonomy\Model\TaxonInterface;
 use Sylius\Component\Taxonomy\Repository\TaxonRepositoryInterface;
 
 /**
@@ -87,7 +86,7 @@ public function findRootNodes()
     /**
      * {@inheritdoc}
      */
-    public function findNodesTreeSorted()
+    public function findNodesTreeSorted($rootCode = null)
     {
         return $this->createQueryBuilder('o')
             ->addOrderBy('o.root')
@@ -96,6 +95,16 @@ public function findNodesTreeSorted()
             ->getQuery()
             ->getResult()
         ;
+
+        if (null !== $rootCode) {
+            $queryBuilder
+                ->join('o.root', 'root')
+                ->andWhere('root.code = :rootCode')
+                ->setParameter('rootCode', $rootCode)
+            ;
+        }
+
+        return $queryBuilder->getQuery()->getResult();
     }
 
     /**

diff --git a/src/Sylius/Bundle/TaxonomyBundle/Form/Type/TaxonChoiceType.php b/src/Sylius/Bundle/TaxonomyBundle/Form/Type/TaxonChoiceType.php
@@ -16,7 +16,6 @@
 use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
@@ -81,21 +80,15 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver
             ->setDefaults([
                 'choices' => function (Options $options) {
-                    $taxons = $this->taxonRepository->findNodesTreeSorted();
-
-                    if (null !== $options['filter']) {
-                        $taxons = array_filter($taxons, $options['filter']);
-                    }
-
-                    return $taxons;
+                    return $this->getTaxons($options['root_code'], $options['filter']);
                 },
                 'choice_value' => 'id',
                 'choice_label' => 'name',
                 'choice_translation_domain' => false,
-                'root' => null,
+                'root_code' => null,
                 'filter' => null,
             ])
-            ->setAllowedTypes('root', [TaxonInterface::class, 'string', 'null'])
+            ->setAllowedTypes('root_code', ['string', 'null'])
             ->setAllowedTypes('filter', ['callable', 'null'])
         ;
     }
@@ -107,4 +100,21 @@ public function getBlockPrefix()
     {
         return 'sylius_taxon_choice';
     }
+
+    /**
+     * @param string|null $rootCode
+     * @param callable|null $filter
+     *
+     * @return TaxonInterface[]
+     */
+    private function getTaxons($rootCode = null, $filter = null)
+    {
+        $taxons = $this->taxonRepository->findNodesTreeSorted($rootCode);
+
+        if (null !== $filter) {
+            $taxons = array_filter($taxons, $filter);
+        }
+
+        return $taxons;
+    }
 }
diff --git a/src/Sylius/Component/Taxonomy/Repository/TaxonRepositoryInterface.php b/src/Sylius/Component/Taxonomy/Repository/TaxonRepositoryInterface.php
@@ -36,10 +36,12 @@ public function findChildren($parentCode);
     public function findRootNodes();
 
     /**
+     * @param string|null $rootCode
+     *
      * @return TaxonInterface[]
      */
-    public function findNodesTreeSorted();
-    
+    public function findNodesTreeSorted($rootCode = null);
+
     /**
      * @param string $slug
      *