don't use global extension as it's breaking commands when schema isn'…

…t synchronized
Victoire · May 1, 2018 · efdf1a5 · efdf1a5
1 parent c104225
commit efdf1a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 44 deletions.
diff --git a/Bundle/ConfigBundle/Resources/config/services.yml b/Bundle/ConfigBundle/Resources/config/services.yml
@@ -7,11 +7,6 @@ services:
         arguments: ["@victoire_core.admin_menu_builder"]
         tags:
             - { name: kernel.event_listener, event: victoire_core.build_menu, method: addGlobal, priority: 70 }
-    Victoire\Bundle\ConfigBundle\Twig\Extension\ConfigExtension:
-        arguments:
-            - "@doctrine.orm.entity_manager"
-        tags:
-            - { name: twig.extension }
     Victoire\Bundle\ConfigBundle\Favicon\FaviconConfigDumper:
         arguments: ['@twig', '%assetic.read_from%']
     Victoire\Bundle\ConfigBundle\Favicon\FaviconGenerator:

diff --git a/Bundle/ConfigBundle/Twig/Extension/ConfigExtension.php b/Bundle/ConfigBundle/Twig/Extension/ConfigExtension.php
diff --git a/Bundle/PageBundle/Helper/PageHelper.php b/Bundle/PageBundle/Helper/PageHelper.php
@@ -19,6 +19,7 @@
 use Victoire\Bundle\BusinessPageBundle\Entity\BusinessPage;
 use Victoire\Bundle\BusinessPageBundle\Entity\BusinessTemplate;
 use Victoire\Bundle\BusinessPageBundle\Helper\BusinessPageHelper;
+use Victoire\Bundle\ConfigBundle\Entity\GlobalConfig;
 use Victoire\Bundle\CoreBundle\Entity\EntityProxy;
 use Victoire\Bundle\CoreBundle\Entity\Link;
 use Victoire\Bundle\CoreBundle\Entity\View;
@@ -273,12 +274,14 @@ public function renderPage($view, $layout = null)
             //Determine which layout to use
             $layout = $this->guessBestLayoutForView($view);
         }
+        $globalConfig = $this->entityManager->getRepository(GlobalConfig::class)->findLast() ?: new GlobalConfig();
 
         //Create the response
         $response = $this->container->get('templating')->renderResponse('VictoireCoreBundle:Layout:'.$layout.'.html.twig', [
-            'view'                            => $view,
+            'globalConfig'                    => $globalConfig,
             'victoire_i18n_available_locales' => $this->availableLocales,
             'victoire_twig_responsive'        => $this->twigResponsive,
+            'view'                            => $view,
         ]);
 
         return $response;