Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-11 13:30:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

navactive status fixed in left menu and top menu

Browse Source
This commit is contained in:
Peter Pfeufer 2020-10-25 11:22:10 +01:00
parent 281dbdbb01
commit 8a91e7f6ac
No known key found for this signature in database
GPG Key ID: 6051D2C6AD4EBC27
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
allianceauth/groupmanagement/auth_hooks.py
View File

@ -9,15 +9,20 @@ from .managers import GroupManager
class GroupManagementMenuItem(MenuItemHook): class GroupManagementMenuItem(MenuItemHook):
""" This class ensures only authorized users will see the menu entry """ """ This class ensures only authorized users will see the menu entry """
def __init__(self): def __init__(self):
# setup menu entry for sidebar # setup menu entry for sidebar
MenuItemHook.__init__( MenuItemHook.__init__(
self, self,
text=_('Group Management'), text=_("Group Management"),
classes='fas fa-users-cog fa-fw', classes="fas fa-users-cog fa-fw",
url_name='groupmanagement:management', url_name="groupmanagement:management",
order=50, 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): def render(self, request):
@ -25,14 +30,14 @@ class GroupManagementMenuItem(MenuItemHook):
app_count = GroupManager.pending_requests_count_for_user(request.user) app_count = GroupManager.pending_requests_count_for_user(request.user)
self.count = app_count if app_count and app_count > 0 else None self.count = app_count if app_count and app_count > 0 else None
return MenuItemHook.render(self, request) return MenuItemHook.render(self, request)
return '' return ""
@hooks.register('menu_item_hook') @hooks.register("menu_item_hook")
def register_menu(): def register_menu():
return GroupManagementMenuItem() return GroupManagementMenuItem()
@hooks.register('url_hook') @hooks.register("url_hook")
def register_urls(): def register_urls():
return UrlHook(urls, 'group', r'^group/') return UrlHook(urls, "group", r"^groups/")

6
allianceauth/groupmanagement/templates/groupmanagement/menu.html
View File

@ -4,7 +4,6 @@
<nav class="navbar navbar-default"> <nav class="navbar navbar-default">
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false"> <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> <span class="sr-only">{% trans "Toggle navigation" %}</span>
@ -12,7 +11,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="">{% trans "Group Management" %}</a> <a class="navbar-brand" href="{% url 'groupmanagement:management' %}">{% trans "Group Management" %}</a>
</div> </div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@ -20,11 +19,10 @@
<li class="{% navactive request 'groupmanagement:management' %}"> <li class="{% navactive request 'groupmanagement:management' %}">
<a href="{% url 'groupmanagement:management' %}">{% trans "Group Requests" %}</a> <a href="{% url 'groupmanagement:management' %}">{% trans "Group Requests" %}</a>
</li> </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> <a href="{% url 'groupmanagement:membership' %}">{% trans "Group Membership" %}</a>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</nav> </nav>