django-camomilla-cms 6.0.0b12__py2.py3-none-any.whl → 6.0.0b13__py2.py3-none-any.whl

camomilla/__init__.py

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

camomilla/managers/__init__.py

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

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)

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:

camomilla/theme/__init__.py

@@ -1 +1 @@
-__version__ = "6.0.0-beta.12"
+__version__ = "6.0.0-beta.13"

{django_camomilla_cms-6.0.0b12.dist-info → django_camomilla_cms-6.0.0b13.dist-info}/METADATA

@@ -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.dist-info → django_camomilla_cms-6.0.0b13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-camomilla/__init__.py,sha256=LFDDiloKFJFLwfKuHUY13zSit_Cqy7PCrOs_zBIv1GY,251
+camomilla/__init__.py,sha256=90D5d1Eo-RHeFug2xM5JHCF6vTFsJbCV_XYQqUIMlpc,251
 camomilla/apps.py,sha256=eUwb9ynyiRAc5OXgt7ZsAdhsCOnPCpNdIFYMheNeN-o,532
 camomilla/authentication.py,sha256=jz6tQT4PPEu-_JLox1LZrOy7EiWBb9MWaObK63MJGus,855
 camomilla/context_processors.py,sha256=cGowjDZ-oDGYn1j2Pj5QDGCqnzXAOdOwp5dmzin_FTc,165
@@ -22,12 +22,14 @@ camomilla/fields/json.py,sha256=tWEDn6kwTP6pNB53djxuVPu2d57m9cIDc4ccCEfUbDQ,1938
 camomilla/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 camomilla/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 camomilla/management/commands/regenerate_thumbnails.py,sha256=pKToASR8p8TJezGpFfuylsAHtriNueJ7xqJJxq55adY,496
+camomilla/managers/__init__.py,sha256=Zwp28E1RKafIl0FqcUi1YNHxF19IsMIvhlhS-Njg9Mw,60
+camomilla/managers/pages.py,sha256=FVXEW1G-O32kUJO4wejYi8QuDp1DIF5FOyj1rSewS0k,1380
 camomilla/models/__init__.py,sha256=y7Q34AGhQ1weJUKWb6XjiyUbwRnJeylOBGMErU0wqYg,147
 camomilla/models/article.py,sha256=LgkZgRsubtDV6NwBz8E2bIgKD6H3I-1QLAxEan5TYYs,1139
 camomilla/models/content.py,sha256=mIgtifb_WMIt58we5u6qWZemHvuDN1zZaBeCyzHL78A,956
 camomilla/models/media.py,sha256=7TD_0nhNoi8P-Gmsr0Kag4eGaxMXuTfQOFl53Mb03cQ,6854
 camomilla/models/menu.py,sha256=rCq0MfHLGM7-7fDVk--AixQZb6_C1gkWMWffKs6QnK4,2841
-camomilla/models/page.py,sha256=MU_GB2O0fJmnEW18X3PfRlmoRpLlHZS8KkLWk62QYK8,14762
+camomilla/models/page.py,sha256=X4Mo4cTbAYyWlpVFtjRjyvI_wE2-zcBU1MR8mm26NQI,15671
 camomilla/models/mixins/__init__.py,sha256=c2NixqvrIX4E9WGRqQbylXlqBWDXEqN9mzs_dpB0hFQ,1248
 camomilla/openapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 camomilla/openapi/schema.py,sha256=kYNtIKnLx4SIj893umIE6u-q3HH9hYH9O4zdZCSOe7U,2100
@@ -67,7 +69,7 @@ camomilla/templates_context/rendering.py,sha256=GfTR45_gC7WT7zTKPVXkBDwe22uF63A-
 camomilla/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 camomilla/templatetags/camomilla_filters.py,sha256=35x0-cWrRHeLhqypSLlJzEFY_fQDcRHiwZQpFgIsspE,692
 camomilla/templatetags/menus.py,sha256=pLFeJ1UAm3flsU9TNo2iQk4otSwZuJPr86Nf408dZ-8,862
-camomilla/theme/__init__.py,sha256=8JarlSY9kzdyHC6fRkhM6KeYj_Wh7CHUKboi4G7DM_A,30
+camomilla/theme/__init__.py,sha256=mU1IlOIVAJC-fMxsbdHtQSVGPT8J6cMmDZXINJZJvBc,30
 camomilla/theme/admin.py,sha256=R3QAfqaF9mhzwfyb_m2_hqTQ2hBcNvQts1MWUX4dUUM,2462
 camomilla/theme/apps.py,sha256=ecqG8ntWdOighYOEHQOMVQpa5g_1WEzzpaaGjnOi9uA,1195
 camomilla/theme/static/admin/css/responsive.css,sha256=yGq6qXrr8xEVsXTnprIBgkX-sMGZrNf0Kkh-xDxf6yE,157
@@ -100,8 +102,8 @@ tests/test_api.py,sha256=DTXtvNNRwvZvxGKi6LyCzhpyU1OzPWGSbBUfRL3-Nck,2101
 tests/test_camomilla_filters.py,sha256=_W9CcwsEyewMBvnNYKk4CVqrkXxRYejle3mjiBS7hqk,1848
 tests/test_models.py,sha256=WJs8lxWZWn1l7X3a_QFVc8fF5LHTsI8bc3uhQe6-o-Q,684
 tests/test_utils.py,sha256=0tdEDBaBkyjAXpbqP0SpFcfgO56MV2TWZmk9xpjR7J0,3613
-django_camomilla_cms-6.0.0b12.dist-info/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
-django_camomilla_cms-6.0.0b12.dist-info/METADATA,sha256=Nh5ciQf2qRxBta_8_Jt-RUnzKyjNdGOZ5cQxYwigUxo,2410
-django_camomilla_cms-6.0.0b12.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-django_camomilla_cms-6.0.0b12.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
-django_camomilla_cms-6.0.0b12.dist-info/RECORD,,
+django_camomilla_cms-6.0.0b13.dist-info/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
+django_camomilla_cms-6.0.0b13.dist-info/METADATA,sha256=axotQ6_8ytKQdCOmKjySs29ExAKuIF8KHcnTqZLoZEM,2410
+django_camomilla_cms-6.0.0b13.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+django_camomilla_cms-6.0.0b13.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
+django_camomilla_cms-6.0.0b13.dist-info/RECORD,,

{django_camomilla_cms-6.0.0b12.dist-info → django_camomilla_cms-6.0.0b13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any