django-camomilla-cms 6.0.0b12__tar.gz → 6.0.0b13__tar.gz

{django-camomilla-cms-6.0.0b12/django_camomilla_cms.egg-info → django-camomilla-cms-6.0.0b13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-camomilla-cms
-Version: 6.0.0b12
+Version: 6.0.0b13
 Summary: Django powered cms
 Author-email: Lotrèk <dimmitutto@lotrek.it>
 License: MIT

{django-camomilla-cms-6.0.0b12 → django-camomilla-cms-6.0.0b13}/camomilla/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "6.0.0-beta.12"
+__version__ = "6.0.0-beta.13"
 
 
 def get_core_apps():

django-camomilla-cms-6.0.0b13/camomilla/managers/__init__.py

@@ -0,0 +1,3 @@
+from .pages import PageQuerySet
+
+__all__ = ["PageQuerySet"]

django-camomilla-cms-6.0.0b13/camomilla/managers/pages.py

@@ -0,0 +1,31 @@
+from typing import Any, Tuple
+from django.db.models.query import QuerySet
+from django.db import transaction
+from django.apps import apps
+
+URL_NODE_RELATED_NAME = "%(app_label)s_%(class)s"
+
+
+class PageQuerySet(QuerySet):
+    def get_or_create(self, defaults=None, **kwargs) -> Tuple[Any, bool]:
+        if "permalink" in kwargs:
+            with transaction.atomic():
+                UrlNode = apps.get_model("camomilla", "UrlNode")
+                url_node, created = UrlNode.objects.get_or_create(
+                    permalink=kwargs.pop("permalink"),
+                    related_name=URL_NODE_RELATED_NAME % self.model_info
+                )
+                if created is False and url_node.page is not None:
+                    page = self.get(**kwargs)
+                    if page.pk != url_node.page.pk:
+                        raise self.model.MultipleObjectsReturned(
+                            "got more than one %s object for the same permalink: %s"
+                            % (
+                                self.model._meta.object_name,
+                                kwargs["permalink"],
+                            )
+                        )
+                    return url_node.page, False
+                kwargs["url_node"] = url_node
+                return super().get_or_create(defaults, **kwargs)
+        return super().get_or_create(defaults, **kwargs)

{django-camomilla-cms-6.0.0b12 → django-camomilla-cms-6.0.0b13}/camomilla/models/page.py

@@ -2,6 +2,8 @@ from typing import Sequence, Tuple
 from uuid import uuid4
 
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.validators import RegexValidator
+
 from django.db import ProgrammingError, OperationalError, models, transaction
 from django.db.models.signals import post_delete
 from django.dispatch import receiver
@@ -12,6 +14,7 @@ from django.utils.functional import lazy
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 
+from camomilla.managers.pages import PageQuerySet
 from camomilla.models.mixins import MetaMixin, SeoMixin
 from camomilla.utils import (
     activate_languages,
@@ -164,6 +167,16 @@ class PageBase(models.base.ModelBase):
         return new_class
 
 
+class UrlPathValidator(RegexValidator):
+    
+    regex = r"^[a-zA-Z0-9_\-\/]+[^\/]$"
+    message = _(
+        "Enter a valid 'slug' consisting of lowercase letters, numbers, "
+        "underscores, hyphens and slashes."
+    )
+    flags = 0
+
+
 class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
     date_created = models.DateTimeField(auto_now_add=True)
     date_updated_at = models.DateTimeField(auto_now=True)
@@ -175,7 +188,9 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
         editable=False,
     )
     breadcrumbs_title = models.CharField(max_length=128, null=True, blank=True)
-    slug = models.SlugField(max_length=150, allow_unicode=True, null=True, blank=True)
+    slug = models.CharField(
+        max_length=150, null=True, blank=True, validators=[UrlPathValidator()]
+    )
     status = models.CharField(
         max_length=3,
         choices=PAGE_STATUS,
@@ -195,6 +210,8 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
         on_delete=models.CASCADE,
     )
 
+    objects = PageQuerySet.as_manager()
+
     def __init__(self, *args, **kwargs):
         super(AbstractPage, self).__init__(*args, **kwargs)
         self._meta.get_field("template").choices = lazy(GET_TEMPLATE_CHOICES, list)()
@@ -294,7 +311,10 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
                 else fallback_slug
             )
             set_nofallbacks(self, "slug", slug)
-        permalink = "/%s" % slugify(slug or "", allow_unicode=True)
+        slug_parts = (slug or "").split("/")
+        for i, part in enumerate(slug_parts):
+            slug_parts[i] = slugify(part, allow_unicode=True)            
+        permalink = "/%s" % "/".join(slug_parts)
         if self.parent:
             permalink = f"{self.parent.permalink}{permalink}"
         qs = UrlNode.objects.exclude(pk=getattr(self.url_node or object, "pk", None))
@@ -376,12 +396,20 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
             raise Http404(ex)
 
     def alternate_urls(self, *args, **kwargs) -> dict:
+        request = False
+        if len(args) > 0:
+            request = args[0]
+        if "request" in kwargs:
+            request = kwargs["request"]
+        preview = request and getattr(request, "GET", {}).get("preview", False)
         permalinks = get_field_translations(self.url_node or object, "permalink", None)
         for lang in activate_languages():
             if lang in permalinks:
                 permalinks[lang] = (
-                    UrlNode.reverse_url(permalinks[lang]) if self.is_public else None
+                    UrlNode.reverse_url(permalinks[lang]) if preview or self.is_public else None
                 )
+            if preview:
+                permalinks = {k: f"{v}?preview=true" for k, v in permalinks.items()}
         return permalinks
 
     class Meta:

django-camomilla-cms-6.0.0b13/camomilla/theme/__init__.py

@@ -0,0 +1 @@
+__version__ = "6.0.0-beta.13"

{django-camomilla-cms-6.0.0b12 → django-camomilla-cms-6.0.0b13/django_camomilla_cms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-camomilla-cms
-Version: 6.0.0b12
+Version: 6.0.0b13
 Summary: Django powered cms
 Author-email: Lotrèk <dimmitutto@lotrek.it>
 License: MIT

{django-camomilla-cms-6.0.0b12 → django-camomilla-cms-6.0.0b13}/django_camomilla_cms.egg-info/SOURCES.txt

@@ -27,6 +27,8 @@ camomilla/fields/json.py
 camomilla/management/__init__.py
 camomilla/management/commands/__init__.py
 camomilla/management/commands/regenerate_thumbnails.py
+camomilla/managers/__init__.py
+camomilla/managers/pages.py
 camomilla/models/__init__.py
 camomilla/models/article.py
 camomilla/models/content.py

{django-camomilla-cms-6.0.0b12 → django-camomilla-cms-6.0.0b13}/setup.py

@@ -1,5 +1,5 @@
 from setuptools import setup
 
-__version__ = "6.0.0-beta.12"
+__version__ = "6.0.0-beta.13"
 
 setup(version=__version__)

django-camomilla-cms-6.0.0b12/camomilla/theme/__init__.py

@@ -1 +0,0 @@
-__version__ = "6.0.0-beta.12"