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

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

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

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

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

{django-camomilla-cms-6.0.0b13 → django-camomilla-cms-6.0.0b14}/camomilla/managers/pages.py

@@ -8,12 +8,21 @@ 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:
+        if "permalink" in kwargs and isinstance(kwargs["permalink"], str):
+            if kwargs["permalink"].startswith("/"):
+                kwargs["permalink"] = kwargs["permalink"][1:]
             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
+                    defaults={
+                        "related_name": URL_NODE_RELATED_NAME
+                        % {
+                            "app_label": self.model._meta.app_label,
+                            "class": self.model._meta.model_name,
+                        }
+                    },
+                    permalink=kwargs["permalink"],
+
                 )
                 if created is False and url_node.page is not None:
                     page = self.get(**kwargs)
@@ -27,5 +36,7 @@ class PageQuerySet(QuerySet):
                         )
                     return url_node.page, False
                 kwargs["url_node"] = url_node
+                kwargs["slug"] = kwargs["permalink"]
+                kwargs.pop("permalink")
                 return super().get_or_create(defaults, **kwargs)
         return super().get_or_create(defaults, **kwargs)

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

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

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

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

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

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

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

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