Merge pull request #142 from Victoire/fix/VICMS-663-contextual-blog-s…

…ettings-unavailable Fix contextual blog settings unavailable
Victoire · Jun 27, 2015 · 3adb034 · 3adb034
2 parents d3eb592 + f207e4a
commit 3adb034
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 14 deletions.
diff --git a/Bundle/BlogBundle/Controller/BlogController.php b/Bundle/BlogBundle/Controller/BlogController.php
@@ -10,6 +10,8 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Victoire\Bundle\BlogBundle\Entity\Blog;
+use Victoire\Bundle\BlogBundle\Repository\BlogRepository;
+use Victoire\Bundle\BusinessEntityPageBundle\Entity\BusinessEntityPagePattern;
 use Victoire\Bundle\PageBundle\Controller\BasePageController;
 use Victoire\Bundle\PageBundle\Entity\BasePage;
 use Victoire\Bundle\BlogBundle\Form\ChooseBlogType;
@@ -42,16 +44,21 @@ public function __construct()
     /**
      * New page
      *
-     * @Route("/", name="victoire_blog_index")
+     * @Route("/{blogId}/{tab}", name="victoire_blog_index", defaults={"blogId" = null, "tab" = "articles"})
+     * @param Request $request
+     * @param integer|null $id
      *
      * @return JsonResponse
      */
-    public function indexAction(Request $request, $isHomepage = false)
+    public function indexAction(Request $request, $blogId = null, $tab = 'articles')
     {
-        $blogRepo = $this->get('doctrine.orm.entity_manager')
-            ->getRepository('VictoireBlogBundle:Blog');
+        /** @var BlogRepository $blogRepo */
+        $blogRepo = $this->get('doctrine.orm.entity_manager')->getRepository('VictoireBlogBundle:Blog');
         $blogs = $blogRepo->getAll()->run();
         $blog = reset($blogs);
+        if (is_numeric($blogId)) {
+            $blog = $blogRepo->find($blogId);
+        }
         $options['blog'] = $blog;
         $template = $this->getBaseTemplatePath().':index.html.twig';
         $chooseBlogForm = $this->createForm(new ChooseBlogType(), null, $options);
@@ -75,9 +82,10 @@ public function indexAction(Request $request, $isHomepage = false)
                 'html' => $this->container->get('victoire_templating')->render(
                     $template,
                     array(
-                        'blog' => $blog,
-                        'tabs' =>  array('articles', 'settings', 'category'),
-                        'chooseBlogForm' => $chooseBlogForm->createView(),
+                        'blog'               => $blog,
+                        'currentTab'         => $tab,
+                        'tabs'               =>  array('articles', 'settings', 'category'),
+                        'chooseBlogForm'     => $chooseBlogForm->createView(),
                         'businessProperties' => $businessProperties,
                     )
                 ),

diff --git a/Bundle/BlogBundle/Listener/BlogMenuListener.php b/Bundle/BlogBundle/Listener/BlogMenuListener.php
@@ -73,9 +73,12 @@ public function addBlogContextual($event)
 
         $mainItem->addChild('menu.blog.settings',
             array(
-                'route'           => 'victoire_blog_settings',
-                'routeParameters' => array('id' => $event->getPage()->getId()),
-                )
+                'route'           => 'victoire_blog_index',
+                'routeParameters' => array(
+                    'blogId' => $event->getPage()->getId(),
+                    'tab'    => 'settings'
+                ),
+            )
         )->setLinkAttribute('data-toggle', 'vic-modal');
 
         $mainItem->addChild('menu.blog.translate',

diff --git a/Bundle/BlogBundle/Resources/views/Blog/Tabs/_settings.html.twig b/Bundle/BlogBundle/Resources/views/Blog/Tabs/_settings.html.twig
@@ -66,8 +66,7 @@
                 </div>
             </div>
 
-
-            <button type="submit" href="#" class="vic-btn vic-btn-success vic-pull-right" title="{{ ('modal.button.settings.title')|trans({}, 'victoire') }}"><i class="fa fa-check-circle"></i> {{ ('modal.button.settings.title')|trans({}, 'victoire') }}</submit>
+            <button type="submit" href="#" class="vic-btn vic-btn-success vic-pull-right" title="{{ ('modal.button.settings.title')|trans({}, 'victoire') }}"><i class="fa fa-check-circle"></i> {{ ('modal.button.settings.title')|trans({}, 'victoire') }}</button>
         </form>
     </div>
 </div>

diff --git a/Bundle/BlogBundle/Resources/views/Blog/Tabs/content.html.twig b/Bundle/BlogBundle/Resources/views/Blog/Tabs/content.html.twig
@@ -1,6 +1,6 @@
 <div class="vic-tab-content vic-modal-tab-content">
     {% for tab in tabs %}
-        <div class="vic-tab-pane{% if loop.first %} vic-active{% endif %}" id="victoire-blog-{{tab}}">
+        <div class="vic-tab-pane{% if tab == currentTab %} vic-active{% endif %}" id="victoire-blog-{{tab}}">
             {{ render(controller('VictoireBlogBundle:Blog:' ~ tab, {'id' : blog.id})) }}
         </div>
     {% endfor %}

diff --git a/Bundle/BlogBundle/Resources/views/Blog/Tabs/nav.html.twig b/Bundle/BlogBundle/Resources/views/Blog/Tabs/nav.html.twig
@@ -2,7 +2,7 @@
 
 <ul class="vic-nav vic-nav-tabs vic-modal-nav-tabs">
     {% for tab in tabs %}
-        <li{% if loop.first %} class="vic-active"{% endif %}>
+        <li{% if tab == currentTab %} class="vic-active"{% endif %}>
             <a class="offer-tab-nav-anchor" href="#victoire-blog-{{tab}}" role="vic-tab" data-toggle="vic-tab">
                 {% spaceless %}
                 <span class="icon victoire-blog-tab-nav-icons victoire-blog-tab-nav-icons-{{ tab }}"></span>
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,8 +66,7 @@ @@
                     </div>
                 </div>
-                <button type="submit" href="#" class="vic-btn vic-btn-success vic-pull-right" title="{{ ('modal.button.settings.title')|trans({}, 'victoire') }}"><i class="fa fa-check-circle"></i> {{ ('modal.button.settings.title')|trans({}, 'victoire') }}</submit>
+                <button type="submit" href="#" class="vic-btn vic-btn-success vic-pull-right" title="{{ ('modal.button.settings.title')|trans({}, 'victoire') }}"><i class="fa fa-check-circle"></i> {{ ('modal.button.settings.title')|trans({}, 'victoire') }}</button>
             </form>
         </div>
     </div>
@@ Expand Down @@