From afa3d2e7cc72fda17c2533c17d408bc7fa76cd07 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Fri, 27 Oct 2023 08:27:53 +0200
Subject: [PATCH 1/3] [FIX] Give template tags modules unique names

This fixes the check error:

?: (templates.E003) 'menu_items' is used for multiple template tag modules: 'allianceauth.menu.templatetags.menu_items', 'allianceauth.services.templatetags.menu_items'
---
 allianceauth/menu/templates/menu/sortable-side-menu.html       | 3 ++-
 .../menu/templatetags/{menu_items.py => menu_menu_items.py}    | 0
 .../templatetags/{menu_items.py => services_menu_items.py}     | 0
 allianceauth/templates/allianceauth/side-menu.html             | 2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)
 rename allianceauth/menu/templatetags/{menu_items.py => menu_menu_items.py} (100%)
 rename allianceauth/services/templatetags/{menu_items.py => services_menu_items.py} (100%)

diff --git a/allianceauth/menu/templates/menu/sortable-side-menu.html b/allianceauth/menu/templates/menu/sortable-side-menu.html
index 12375745..a9c0ed04 100644
--- a/allianceauth/menu/templates/menu/sortable-side-menu.html
+++ b/allianceauth/menu/templates/menu/sortable-side-menu.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 {% load navactive %}
-{% load menu_items %}
+{% load menu_menu_items %}
+
 <div class="col-auto px-0 " >
     <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar" >
         <div style="width: 350px;">
diff --git a/allianceauth/menu/templatetags/menu_items.py b/allianceauth/menu/templatetags/menu_menu_items.py
similarity index 100%
rename from allianceauth/menu/templatetags/menu_items.py
rename to allianceauth/menu/templatetags/menu_menu_items.py
diff --git a/allianceauth/services/templatetags/menu_items.py b/allianceauth/services/templatetags/services_menu_items.py
similarity index 100%
rename from allianceauth/services/templatetags/menu_items.py
rename to allianceauth/services/templatetags/services_menu_items.py
diff --git a/allianceauth/templates/allianceauth/side-menu.html b/allianceauth/templates/allianceauth/side-menu.html
index fc8335b0..0c996a96 100644
--- a/allianceauth/templates/allianceauth/side-menu.html
+++ b/allianceauth/templates/allianceauth/side-menu.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% load navactive %}
-{% load menu_items %}
+{% load menu_menu_items %}
 
 <div class="col-sm-2 auth-side-navbar" role="navigation">
     <div class="collapse navbar-collapse auth-menus-collapse auth-side-navbar-collapse">

From e379c016559d684a202906a5ac0f2b3d491c1660 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Fri, 27 Oct 2023 08:31:55 +0200
Subject: [PATCH 2/3] [FIX] Typo in variable name while we're at it

---
 allianceauth/menu/templatetags/menu_menu_items.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/allianceauth/menu/templatetags/menu_menu_items.py b/allianceauth/menu/templatetags/menu_menu_items.py
index 3d01b90c..04a1288a 100644
--- a/allianceauth/menu/templatetags/menu_menu_items.py
+++ b/allianceauth/menu/templatetags/menu_menu_items.py
@@ -29,7 +29,7 @@ def menu_items(context):
 @register.inclusion_tag('menu/menu-block.html', takes_context=True)
 def sorted_menu_items(context):
     request = context['request']
-    manu_items = MenuItem.render_menu(request)
+    menu_items = MenuItem.render_menu(request)
     return {
-        'menu_items':manu_items
+        'menu_items':menu_items
     }

From 4675193416ef87092d226596753d6ebf5095fd2c Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Fri, 27 Oct 2023 14:08:44 +0200
Subject: [PATCH 3/3] [REEMOVE] `services.templatetags` as its no longer needed

---
 .../services/templatetags/__init__.py         |  0
 .../templatetags/services_menu_items.py       | 23 -------------------
 2 files changed, 23 deletions(-)
 delete mode 100644 allianceauth/services/templatetags/__init__.py
 delete mode 100644 allianceauth/services/templatetags/services_menu_items.py

diff --git a/allianceauth/services/templatetags/__init__.py b/allianceauth/services/templatetags/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/allianceauth/services/templatetags/services_menu_items.py b/allianceauth/services/templatetags/services_menu_items.py
deleted file mode 100644
index 6485641a..00000000
--- a/allianceauth/services/templatetags/services_menu_items.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from django import template
-
-from allianceauth.hooks import get_hooks
-
-register = template.Library()
-
-
-def process_menu_items(hooks, request):
-    _menu_items = list()
-    items = [fn() for fn in hooks]
-    items.sort(key=lambda i: i.order)
-    for item in items:
-        _menu_items.append(item.render(request))
-    return _menu_items
-
-
-@register.inclusion_tag('public/menublock.html', takes_context=True)
-def menu_items(context):
-    request = context['request']
-
-    return {
-        'menu_items': process_menu_items(get_hooks('menu_item_hook'), request),
-    }