From 483ac388888345bbfe332c5d7caf663bb34b5e19 Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@hsal.es>
Date: Thu, 15 Apr 2021 16:57:39 +0000
Subject: [PATCH] [Directory] Fixup directory plugin

---
 plugins/Directory/Directory.php                 | 17 +++++------------
 .../templates/directory/actors.html.twig        |  8 +++++---
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/plugins/Directory/Directory.php b/plugins/Directory/Directory.php
index b565ff1d8a..4ce9b45cdb 100644
--- a/plugins/Directory/Directory.php
+++ b/plugins/Directory/Directory.php
@@ -32,8 +32,9 @@ class Directory extends Module
      */
     public function onAddRoute(RouteLoader $r)
     {
-        $r->connect('actors', '/actors', [Controller\Directory::class, 'actors']);
-        $r->connect('groups', '/groups', [Controller\Directory::class, 'groups']);
+        $r->connect('directory_actors', '/actors', [Controller\Directory::class, 'actors']);
+        $r->connect('directory_groups', '/groups', [Controller\Directory::class, 'groups']);
+
         return Event::next;
     }
 
@@ -46,16 +47,8 @@ class Directory extends Module
      */
     public function onStartTwigPopulateVars(array &$vars): bool
     {
-        $vars['main_nav_tabs'] = [
-            [
-                'title' => 'Actors',
-                'route' => 'actors',
-            ],
-            [
-                'title' => 'Groups',
-                'route' => 'groups',
-            ],
-        ];
+        $vars['main_nav_tabs'][] = ['title' => 'Actors', 'route' => 'directory_actors'];
+        $vars['main_nav_tabs'][] = ['title' => 'Groups', 'route' => 'directory_groups'];
 
         return Event::next;
     }
diff --git a/plugins/Directory/templates/directory/actors.html.twig b/plugins/Directory/templates/directory/actors.html.twig
index 8498110a6b..2ef6e73d82 100644
--- a/plugins/Directory/templates/directory/actors.html.twig
+++ b/plugins/Directory/templates/directory/actors.html.twig
@@ -91,11 +91,13 @@
                         <li>
                             <a href="{{ path('main_all') }}" class='hover-effect {{ active('main_all') }}'>Network</a>
                         </li>
-                        {% for tab in main_nav_tabs %}
+                        {% if main_nav_tabs is defined %}
+                          {% for tab in main_nav_tabs %}
                             <li>
-                                <a href="{{ path(tab['route']) }}" class='hover-effect {{ active(tab['route']) }}' >{{ tab['title'] }}</a>
+                              <a href="{{ path(tab['route']) }}" class='hover-effect {{ active(tab['route']) }}' >{{ tab['title'] }}</a>
                             </li>
-                        {% endfor %}
+                          {% endfor %}
+                        {% endif %}
                     </ul>
                 </nav>
                 <div class="timeline">