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

camomilla/__init__.py

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

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)

camomilla/theme/__init__.py

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

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

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

@@ -1,4 +1,4 @@
-camomilla/__init__.py,sha256=90D5d1Eo-RHeFug2xM5JHCF6vTFsJbCV_XYQqUIMlpc,251
+camomilla/__init__.py,sha256=QPq2GvO5-zT08-jIOFOjDeg33wtHP-Q3zFfpvPWr-YM,251
 camomilla/apps.py,sha256=eUwb9ynyiRAc5OXgt7ZsAdhsCOnPCpNdIFYMheNeN-o,532
 camomilla/authentication.py,sha256=jz6tQT4PPEu-_JLox1LZrOy7EiWBb9MWaObK63MJGus,855
 camomilla/context_processors.py,sha256=cGowjDZ-oDGYn1j2Pj5QDGCqnzXAOdOwp5dmzin_FTc,165
@@ -23,7 +23,7 @@ camomilla/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 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/managers/pages.py,sha256=6L35RPzfJbEntjWfEzw0b9ruhOwoVaITUD-RyxuK5yc,1857
 camomilla/models/__init__.py,sha256=y7Q34AGhQ1weJUKWb6XjiyUbwRnJeylOBGMErU0wqYg,147
 camomilla/models/article.py,sha256=LgkZgRsubtDV6NwBz8E2bIgKD6H3I-1QLAxEan5TYYs,1139
 camomilla/models/content.py,sha256=mIgtifb_WMIt58we5u6qWZemHvuDN1zZaBeCyzHL78A,956
@@ -69,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=mU1IlOIVAJC-fMxsbdHtQSVGPT8J6cMmDZXINJZJvBc,30
+camomilla/theme/__init__.py,sha256=UVNasDCHfmeetQsfJsCQ1TN3YgarCjDERgSZX0OwKT8,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
@@ -102,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.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.0b14.dist-info/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
+django_camomilla_cms-6.0.0b14.dist-info/METADATA,sha256=Epgi0FSONdA7m9MZnYCTufligreZhHcNT3OD0jOgKo4,2410
+django_camomilla_cms-6.0.0b14.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+django_camomilla_cms-6.0.0b14.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
+django_camomilla_cms-6.0.0b14.dist-info/RECORD,,