Merge branch 'fix-same-name-template-tag-modules' into 'v4.x'

[FIX] Give template tag modules unique names

See merge request allianceauth/allianceauth!1548

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;">

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
     }

allianceauth/services/templatetags/menu_items.py

@@ -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),
-    }

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">