django-lineup 0.3.2__tar.gz → 0.3.4__tar.gz

{django-lineup-0.3.2 → django-lineup-0.3.4}/HISTORY.rst

@@ -3,6 +3,17 @@
 History
 -------
 
+0.3.4 (2024-06-18)
+++++++++++++++++++
+
+* Fix caching with multiple menus
+
+0.3.3 (2024-06-18)
+++++++++++++++++++
+
+* Improve overall performance
+* Add cache
+
 0.3.2 (2024-05-30)
 ++++++++++++++++++
 

{django-lineup-0.3.2 → django-lineup-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-lineup
-Version: 0.3.2
+Version: 0.3.4
 Summary: Navigation system for django sites
 Home-page: https://github.com/otto-torino/django-lineup
 Author: abidibo
@@ -37,6 +37,9 @@ Django Lineup
 .. image:: https://codecov.io/gh/otto-torino/django-lineup/branch/master/graph/badge.svg
     :target: https://codecov.io/gh/otto-torino/django-lineup
 
+.. image:: https://static.pepy.tech/badge/django-lineup
+    :target: https://pepy.tech/project/django-lineup
+
 Multiple navigation system for django sites.
 
 Django Lineup lets you manage a tree of items. Each first level node represents a menu you can include in your templates.
@@ -238,6 +241,17 @@ Tools used in rendering this package:
 History
 -------
 
+0.3.4 (2024-06-18)
+++++++++++++++++++
+
+* Fix caching with multiple menus
+
+0.3.3 (2024-06-18)
+++++++++++++++++++
+
+* Improve overall performance
+* Add cache
+
 0.3.2 (2024-05-30)
 ++++++++++++++++++
 

{django-lineup-0.3.2 → django-lineup-0.3.4}/README.rst

@@ -11,6 +11,9 @@ Django Lineup
 .. image:: https://codecov.io/gh/otto-torino/django-lineup/branch/master/graph/badge.svg
     :target: https://codecov.io/gh/otto-torino/django-lineup
 
+.. image:: https://static.pepy.tech/badge/django-lineup
+    :target: https://pepy.tech/project/django-lineup
+
 Multiple navigation system for django sites.
 
 Django Lineup lets you manage a tree of items. Each first level node represents a menu you can include in your templates.

{django-lineup-0.3.2 → django-lineup-0.3.4}/django_lineup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-lineup
-Version: 0.3.2
+Version: 0.3.4
 Summary: Navigation system for django sites
 Home-page: https://github.com/otto-torino/django-lineup
 Author: abidibo
@@ -37,6 +37,9 @@ Django Lineup
 .. image:: https://codecov.io/gh/otto-torino/django-lineup/branch/master/graph/badge.svg
     :target: https://codecov.io/gh/otto-torino/django-lineup
 
+.. image:: https://static.pepy.tech/badge/django-lineup
+    :target: https://pepy.tech/project/django-lineup
+
 Multiple navigation system for django sites.
 
 Django Lineup lets you manage a tree of items. Each first level node represents a menu you can include in your templates.
@@ -238,6 +241,17 @@ Tools used in rendering this package:
 History
 -------
 
+0.3.4 (2024-06-18)
+++++++++++++++++++
+
+* Fix caching with multiple menus
+
+0.3.3 (2024-06-18)
+++++++++++++++++++
+
+* Improve overall performance
+* Add cache
+
 0.3.2 (2024-05-30)
 ++++++++++++++++++
 

{django-lineup-0.3.2 → django-lineup-0.3.4}/django_lineup.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ lineup/__init__.py
 lineup/admin.py
 lineup/apps.py
 lineup/exceptions.py
+lineup/forms.py
 lineup/managers.py
 lineup/models.py
 lineup/urls.py

django-lineup-0.3.4/lineup/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.3.4'

{django-lineup-0.3.2 → django-lineup-0.3.4}/lineup/admin.py

@@ -7,6 +7,7 @@ from django.utils.translation import gettext_lazy as _
 from mptt.admin import MPTTModelAdmin
 
 from .models import MenuItem
+from .forms import MenuItemForm
 
 baton = 'baton' in sys.modules
 
@@ -19,6 +20,7 @@ class MenuItemInline(admin.StackedInline):
     Tabular Inline View for MenuItem
     '''
     model = MenuItem
+    form = MenuItemForm
     extra = 1
     classes = ('collapse-entry', 'expand-first', )
     prepopulated_fields = {'slug': ('label',)}
@@ -26,6 +28,7 @@ class MenuItemInline(admin.StackedInline):
 
 @admin.register(MenuItem)
 class MenuItemAdmin(MPTTModelAdmin):
+    form = MenuItemForm
     change_list_template = "admin/lineup/menuitem/change_list.html"
     list_display = ('slug', 'label', 'parent', 'link', 'order', 'login_required', 'enabled', )
     list_filter = (('parent', RelatedDropdownFilter, ) if baton else 'parent', 'enabled', 'login_required', )

django-lineup-0.3.4/lineup/forms.py

@@ -0,0 +1,10 @@
+from django import forms
+
+class MenuItemForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        permissions = self.fields.get("permissions")
+        if permissions:
+            permissions.queryset = permissions.queryset.select_related(
+                "content_type"
+            )

{django-lineup-0.3.2 → django-lineup-0.3.4}/lineup/models.py

@@ -8,6 +8,9 @@ from django.db import models
 from django.utils.translation import gettext_lazy as _
 from django.utils.safestring import mark_safe
 from django.db import transaction
+from django.db.models.signals import post_delete, post_save
+from django.dispatch import receiver
+from django.core.cache import cache
 
 from mptt.models import MPTTModel, TreeForeignKey
 
@@ -118,7 +121,7 @@ class MenuItem(MPTTModel):
 
         return item
 
-    def is_active(self, path):
+    def is_active(self, path, prefix=""):
         return self.link and self.link == path
 
     def extras_dict(self):
@@ -129,3 +132,8 @@ class MenuItem(MPTTModel):
             )
         except Exception:
             return {}
+
+@receiver(post_save, sender=MenuItem)
+@receiver(post_delete, sender=MenuItem)
+def clear_lineup_cache(sender , **kwargs):
+    cache.delete("lineup")

{django-lineup-0.3.2 → django-lineup-0.3.4}/lineup/templatetags/lineup_tags.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 import logging
+from django.core.cache import cache
 
 from django import template
 from django.contrib.auth.models import Permission
-from django.db.models import Q
+from django.db.models import Q, Count
+from django.urls import LocalePrefixPattern
 
 from ..models import MenuItem
 
@@ -24,13 +26,22 @@ def get_all_user_permissions_id_list(user):
     return perms + group_perms
 
 
+def remove_prefix(text, prefix): # TODO: introduce in python 3.9, so this can be removed
+    if text.startswith(prefix):
+        return text[len(prefix):]
+    return text
+
+
 def set_active_voice(path, items):
     """
     Sets the active property to the active voice, and with_active to
     all its parents
     """
+
+    l = LocalePrefixPattern(prefix_default_language=True)
+    prefix = l.language_prefix
     for item in items:
-        if item.get("instance").is_active(path):
+        if item.get("instance").is_active(remove_prefix(path, prefix)):
             item["active"] = True
             parent = item.get("parent")
             while parent is not None:
@@ -48,16 +59,16 @@ def create_tree(context, root, parent=None):
 
     # if root visibility restrictions and user is not authenticated do not show children
     if not user.is_authenticated and (
-        root.login_required or root.permissions.count()
+        root.login_required or root.permissions_count > 0
     ):  # noqa
         return {}
 
     if not user.is_authenticated:
         # unlogged user sees only public items
-        items = root.children.enabled(login_required=False, permissions=None)
+        items = root.children.enabled(login_required=False, permissions=None).annotate(permissions_count=Count("permissions"))
     elif user.is_superuser:
         # superuser sees all enabled items
-        items = root.children.enabled()
+        items = root.children.enabled().annotate(permissions_count=Count("permissions"))
     else:
         # logged in user which is not superuse should check for permissions
         permissions = context.get("lineup_permissions", None)
@@ -68,7 +79,7 @@ def create_tree(context, root, parent=None):
 
         items = root.children.enabled(
             Q(permissions__id__in=permissions) | Q(permissions=None)
-        ).distinct()
+        ).annotate(permissions_count=Count("permissions")).distinct()
 
     # parent needed to traverse upward for has-active functionality
     el = {"instance": root, "parent": parent}
@@ -92,11 +103,23 @@ def lineup_menu(context, item):
     """
     if isinstance(item, str):
         try:
-            root = MenuItem.objects.get(slug=item)
-            tree = create_tree(context, root)
-            items = tree.get("children", [])
-            slug = item
-            level = root.level
+            # cache depends on user (permissions) and path (active item)
+            path = ""
+            user = context.get("user")
+            if "request" in context:
+                path = context["request"].META["PATH_INFO"]
+            t = cache.get_or_set("lineup", {}, None)
+            key = "%s:%s:%s" % (item, user.id, path)
+            if t.get(key, None) is None:
+                root = MenuItem.objects.prefetch_related("children", "permissions").annotate(permissions_count=Count("permissions")).get(slug=item)
+                tree = create_tree(context, root)
+                items = tree.get("children", [])
+                slug = item
+                level = root.level
+                t[key] = (items, slug, level)
+                cache.set("lineup", t, None)
+            else:
+                (items, slug, level) = t[key]
         except MenuItem.DoesNotExist:
             logger.error("Provided lineup menu slug %s not found" % item)
             return context

{django-lineup-0.3.2 → django-lineup-0.3.4}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.2
+current_version = 0.3.4
 
 [wheel]
 universal = 1

django-lineup-0.3.2/lineup/__init__.py

@@ -1 +0,0 @@
-__version__ = '0.3.2'