From 8a91e7f6ac16a55fd884db05c7661b5e77094d6c Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Sun, 25 Oct 2020 11:22:10 +0100
Subject: [PATCH] navactive status fixed in left menu and top menu

---
 allianceauth/groupmanagement/auth_hooks.py    | 21 ++++++++++++-------
 .../templates/groupmanagement/menu.html       |  6 ++----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/allianceauth/groupmanagement/auth_hooks.py b/allianceauth/groupmanagement/auth_hooks.py
index 6d11e41d..e077110b 100644
--- a/allianceauth/groupmanagement/auth_hooks.py
+++ b/allianceauth/groupmanagement/auth_hooks.py
@@ -9,15 +9,20 @@ from .managers import GroupManager
 
 class GroupManagementMenuItem(MenuItemHook):
     """ This class ensures only authorized users will see the menu entry """
+
     def __init__(self):
         # setup menu entry for sidebar
         MenuItemHook.__init__(
             self,
-            text=_('Group Management'),
-            classes='fas fa-users-cog fa-fw',
-            url_name='groupmanagement:management',
+            text=_("Group Management"),
+            classes="fas fa-users-cog fa-fw",
+            url_name="groupmanagement:management",
             order=50,
-            navactive=['groupmanagement:management']
+            navactive=[
+                "groupmanagement:management",  # group requests view
+                "groupmanagement:membership",  # group membership view
+                "groupmanagement:audit_log",  # group audit log view
+            ],
         )
 
     def render(self, request):
@@ -25,14 +30,14 @@ class GroupManagementMenuItem(MenuItemHook):
             app_count = GroupManager.pending_requests_count_for_user(request.user)
             self.count = app_count if app_count and app_count > 0 else None
             return MenuItemHook.render(self, request)
-        return ''
+        return ""
 
 
-@hooks.register('menu_item_hook')
+@hooks.register("menu_item_hook")
 def register_menu():
     return GroupManagementMenuItem()
 
 
-@hooks.register('url_hook')
+@hooks.register("url_hook")
 def register_urls():
-    return UrlHook(urls, 'group', r'^group/')
+    return UrlHook(urls, "group", r"^groups/")
diff --git a/allianceauth/groupmanagement/templates/groupmanagement/menu.html b/allianceauth/groupmanagement/templates/groupmanagement/menu.html
index a0a057e7..788b987e 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/menu.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/menu.html
@@ -4,7 +4,6 @@
 
 <nav class="navbar navbar-default">
     <div class="container-fluid">
-
         <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
                 <span class="sr-only">{% trans "Toggle navigation" %}</span>
@@ -12,7 +11,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="">{% trans "Group Management" %}</a>
+            <a class="navbar-brand" href="{% url 'groupmanagement:management' %}">{% trans "Group Management" %}</a>
         </div>
 
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@@ -20,11 +19,10 @@
                 <li class="{% navactive request 'groupmanagement:management' %}">
                     <a href="{% url 'groupmanagement:management' %}">{% trans "Group Requests" %}</a>
                 </li>
-                <li class="{% renavactive request '^/group/membership/' %}">
+                <li class="{% navactive request 'groupmanagement:membership groupmanagement:audit_log' %}">
                     <a href="{% url 'groupmanagement:membership' %}">{% trans "Group Membership" %}</a>
                 </li>
             </ul>
         </div>
-        
     </div>
 </nav>