Merge pull request #348 from Charlie-Lucas/master

Add the possibility to use businessTemplate constant to generate business links
Victoire · Mar 2, 2016 · 2476589 · 2476589
2 parents fe8eef7 + e0aa1e7
commit 2476589
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/Bundle/CoreBundle/DependencyInjection/Configuration.php b/Bundle/CoreBundle/DependencyInjection/Configuration.php
@@ -35,6 +35,12 @@ public function getConfigTreeBuilder()
                 ->defaultValue(['%kernel.root_dir%/../src', '%kernel.root_dir%/../vendor/victoire/victoire/Bundle/BlogBundle', '%kernel.root_dir%/../vendor/friendsofvictoire'])
                 ->end()
             ->end()
+            ->children()
+                ->variableNode('businessTemplates')
+                ->defaultNull()
+                ->treatNullLike([])
+                ->end()
+            ->end()
             ->children()
                 ->variableNode('applicative_bundle')
                 ->defaultNull()

diff --git a/Bundle/CoreBundle/DependencyInjection/VictoireCoreExtension.php b/Bundle/CoreBundle/DependencyInjection/VictoireCoreExtension.php
@@ -74,5 +74,8 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter(
             'victoire_core.base_paths', $config['base_paths']
         );
+        $container->setParameter(
+            'victoire_core.businessTemplates', $config['businessTemplates']
+        );
     }
 }
diff --git a/Bundle/WidgetBundle/Resources/config/services.yml b/Bundle/WidgetBundle/Resources/config/services.yml
@@ -70,7 +70,7 @@ services:
             - @victoire_business_page.business_page_helper
             - @victoire_page.page_helper
             - @doctrine.orm.entity_manager
-            - @victoire_core.url_builder
+            - %victoire_core.businessTemplates%
         tags:
             - { name: twig.extension }
 

diff --git a/Bundle/WidgetBundle/Twig/LinkExtension.php b/Bundle/WidgetBundle/Twig/LinkExtension.php
@@ -22,15 +22,29 @@ class LinkExtension extends \Twig_Extension
     protected $BusinessPageHelper; // @victoire_business_page.business_page_helper
     protected $pageHelper;
     protected $em; // @doctrine.orm.entity_manager
+    protected $abstractBusinessTemplates;
 
+    /**
+     * LinkExtension constructor.
+     *
+     * @param Router       $router
+     * @param RequestStack $requestStack
+     * @param $analytics
+     * @param BusinessEntityHelper $businessEntityHelper
+     * @param BusinessPageHelper   $BusinessPageHelper
+     * @param PageHelper           $pageHelper
+     * @param EntityManager        $em
+     * @param array                $abstractBusinessTemplates
+     */
     public function __construct(
         Router $router,
         RequestStack $requestStack,
         $analytics,
         BusinessEntityHelper $businessEntityHelper,
         BusinessPageHelper $BusinessPageHelper,
         PageHelper $pageHelper,
-        EntityManager $em
+        EntityManager $em,
+        $abstractBusinessTemplates = []
     ) {
         $this->router = $router;
         $this->request = $requestStack->getCurrentRequest();
@@ -39,6 +53,7 @@ public function __construct(
         $this->BusinessPageHelper = $BusinessPageHelper;
         $this->pageHelper = $pageHelper;
         $this->em = $em;
+        $this->abstractBusinessTemplates = $abstractBusinessTemplates;
     }
 
     /**
@@ -212,6 +227,9 @@ public function victoireMenuLink($parameters, $label, $attr = [])
 
     public function victoireBusinessLink($businessEntityInstance, $templateId = null, $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH)
     {
+        if (isset($this->abstractBusinessTemplates[$templateId])) {
+            $templateId = $this->abstractBusinessTemplates[$templateId];
+        }
         if (!$templateId) {
             $templateId = $this->BusinessPageHelper
                 ->guessBestPatternIdForEntity(new \ReflectionClass($businessEntityInstance), $businessEntityInstance->getId(), $this->em);