django-camomilla-cms 6.0.0b8__py2.py3-none-any.whl → 6.0.0b10__py2.py3-none-any.whl

camomilla/__init__.py

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

camomilla/dynamic_pages_urls.py

@@ -1,13 +1,16 @@
-from django.shortcuts import render
+from django.shortcuts import redirect, render
 from django.urls import path
 
 from camomilla import settings
-
+from django.conf import settings as django_settings
 from .models import Page
 
 
 def fetch(request, *args, **kwargs):
     preview = request.user.is_staff and request.GET.get("preview", False)
+    append_slash = getattr(django_settings, "APPEND_SLASH", True)
+    if append_slash and not request.path.endswith("/"):
+        return redirect(request.path + "/")
     if "permalink" in kwargs:
         page = Page.get_or_404(
             request, bypass_public_check=preview, bypass_type_check=True

camomilla/models/page.py

@@ -25,6 +25,7 @@ from camomilla.utils import (
 from camomilla.utils.getters import pointed_getter
 from camomilla import settings
 from camomilla.templates_context.rendering import ctx_registry
+from django.conf import settings as django_settings
 
 
 def GET_TEMPLATE_CHOICES():
@@ -117,10 +118,14 @@ class UrlNode(models.Model):
 
     @staticmethod
     def reverse_url(permalink: str) -> str:
+        append_slash = getattr(django_settings, "APPEND_SLASH", True)
         try:
             if permalink == "/":
                 return reverse("camomilla-homepage")
-            return reverse("camomilla-permalink", args=(permalink.lstrip("/"),))
+            url = reverse("camomilla-permalink", args=(permalink.lstrip("/"),))
+            if append_slash and not url.endswith("/"):
+                url += "/"
+            return url
         except NoReverseMatch:
             return None
 
@@ -314,12 +319,14 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
     def get(cls, request, *args, **kwargs) -> "AbstractPage":
         bypass_type_check = kwargs.pop("bypass_type_check", False)
         bypass_public_check = kwargs.pop("bypass_public_check", False)
-
+        path = request.path
+        if getattr(django_settings, "APPEND_SLASH", True):
+            path = path.rstrip("/")
         if len(kwargs.keys()) > 0:
             page = cls.objects.get(**kwargs)
         else:
             node = UrlNode.objects.filter(
-                permalink=url_lang_decompose(request.path)["permalink"]
+                permalink=url_lang_decompose(path)["permalink"]
             ).first()
             page = node and node.page
         type_error = not bypass_type_check and not isinstance(page, cls)
@@ -367,10 +374,10 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
             raise Http404(ex)
 
     def alternate_urls(self, *args, **kwargs) -> dict:
-        permalinks = get_field_translations(self.url_node or object, "permalink", None)
+        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])
+                permalinks[lang] = UrlNode.reverse_url(permalinks[lang]) if self.is_public else None
         return permalinks
 
     class Meta:

camomilla/templates/defaults/parts/langswitch.html

@@ -40,7 +40,7 @@
         <div class="language-switch--btn" data-lang="{{lang_code}}" 
             {% if current_lang.code != lang_code %} 
                 {% if redirect is None %}
-                    onclick="submitLanguageWithoutRedirect('{{lang_code}}');"
+                    onclick="submitLanguageHomeRedirect('{{lang_code}}');"
                 {% else %}
                     onclick="submitLanguage('{{lang_code}}', '{{redirect|strip_lang:lang_code}}');"
                 {% endif %}
@@ -71,5 +71,13 @@
             document.getElementById('form_change_language').submit();
         }, 300);
     };
+    window.submitLanguageHomeRedirect = function (langCode) {
+        document.getElementById('select_change_language').value = langCode;
+        document.getElementById('next_form_change_language').value = "/";
+        document.getElementById('next_form_change_language').disabled = false;
+        setTimeout(function () {
+            document.getElementById('form_change_language').submit();
+        }, 300);
+    };
 
 </script>

camomilla/theme/__init__.py

@@ -1 +1 @@
-__version__ = "6.0.0-beta.8"
+__version__ = "6.0.0-beta.10"

{django_camomilla_cms-6.0.0b8.dist-info → django_camomilla_cms-6.0.0b10.dist-info}/METADATA

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

{django_camomilla_cms-6.0.0b8.dist-info → django_camomilla_cms-6.0.0b10.dist-info}/RECORD

@@ -1,9 +1,9 @@
-camomilla/__init__.py,sha256=98T7M-avlYhd40ECxyz1XOssnuaKOv8nz_XK4HIU5xc,250
+camomilla/__init__.py,sha256=290K2wRZs39ioj08zf-jjuskE8j9hWSRl4qThb90zFY,251
 camomilla/apps.py,sha256=eUwb9ynyiRAc5OXgt7ZsAdhsCOnPCpNdIFYMheNeN-o,532
 camomilla/authentication.py,sha256=jz6tQT4PPEu-_JLox1LZrOy7EiWBb9MWaObK63MJGus,855
 camomilla/context_processors.py,sha256=cGowjDZ-oDGYn1j2Pj5QDGCqnzXAOdOwp5dmzin_FTc,165
 camomilla/defaults.py,sha256=VNQ_sbxu09AyFGNpUUYypIAyhlBhEORD36BBNj7e73I,1220
-camomilla/dynamic_pages_urls.py,sha256=VC1cESk6SS7ixsq6-LevnpPOk1Xjphhd4r3vzvy17O0,781
+camomilla/dynamic_pages_urls.py,sha256=HBI8gCe0Vd9mE74QrIVP57K4ThWopEW4r7jZnFHulTk,1008
 camomilla/exceptions.py,sha256=gLniAsK_pmsNNKGMv5Z384LXVbM8oeHcOwz4F91u1LY,111
 camomilla/model_api.py,sha256=VC3tNQucS3-KVtdZNWkkbkJn8vtl_cBKYTcC3QU6PpU,2253
 camomilla/parsers.py,sha256=fL8XGCGPxJIZNZkPdGtnPSbDP-6-yzGOCVMuLPjkx9Y,1975
@@ -27,7 +27,7 @@ camomilla/models/article.py,sha256=LgkZgRsubtDV6NwBz8E2bIgKD6H3I-1QLAxEan5TYYs,1
 camomilla/models/content.py,sha256=mIgtifb_WMIt58we5u6qWZemHvuDN1zZaBeCyzHL78A,956
 camomilla/models/media.py,sha256=7TD_0nhNoi8P-Gmsr0Kag4eGaxMXuTfQOFl53Mb03cQ,6854
 camomilla/models/menu.py,sha256=GdywN50yp7ezXzy8SF8P-W3ejey31ZPlJYp2cEM38Uk,2835
-camomilla/models/page.py,sha256=VLolS42Abh2RZ5a4P1NRCPgEhugUDapcUOswSo1bbdc,14208
+camomilla/models/page.py,sha256=ICRATTJ1UNdI0fhVh0o4Hl-sG-2zC_L_LmZ6i_Lqtcw,14584
 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
@@ -58,7 +58,7 @@ camomilla/templates/admin/camomilla/page/change_form.html,sha256=ig7rRUtylDZMINB
 camomilla/templates/defaults/base.html,sha256=pklt7Pif3g9d7gwgRxCQj7gniJaHD14ZqZID_xIlC0A,6638
 camomilla/templates/defaults/articles/default.html,sha256=1f89jBvNtTa1mPAbC91yy8CzeAjTWO3hhQsTuQW5OKg,239
 camomilla/templates/defaults/pages/default.html,sha256=bP81Qb6M56I-fBJMywWwEu_cnERtWIX28UkGrUSRU6M,144
-camomilla/templates/defaults/parts/langswitch.html,sha256=sDvT8HZidPNnS-adSkaK3fvB2CAahUuDHBaV86tscDs,3009
+camomilla/templates/defaults/parts/langswitch.html,sha256=AkaQzb2KNjRYCMLUn_jE31V36rwBIwp4MneirWPiBcI,3424
 camomilla/templates/defaults/parts/menu.html,sha256=KBgXv23dCWW0XM16R5fT0_g-w_qudVfcF-CYSdwl83s,338
 camomilla/templates/defaults/widgets/media_select_multiple.html,sha256=k2XYou8KkPuFLnPMkPJAFJ-zGJj2Xvu6R3ZmiKa3g7Q,3727
 camomilla/templates_context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -67,7 +67,7 @@ camomilla/templates_context/rendering.py,sha256=CyMFKPo8YIJzITco748z56-zsxwBUcZ_
 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=JxdeZSWRPvuszvsNGymXrtSuAPl6RMy9kPN89Ndg8q4,29
+camomilla/theme/__init__.py,sha256=ArO8-b74tqvW5bMSXNGa4K56kB3oiCNhmwbpq8di0K0,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 +100,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.0b8.dist-info/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
-django_camomilla_cms-6.0.0b8.dist-info/METADATA,sha256=bEKZKW4cpfLqrW0zhZ8X9lHCEKjW1gsGi0Wb1O3oOMI,2409
-django_camomilla_cms-6.0.0b8.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-django_camomilla_cms-6.0.0b8.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
-django_camomilla_cms-6.0.0b8.dist-info/RECORD,,
+django_camomilla_cms-6.0.0b10.dist-info/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
+django_camomilla_cms-6.0.0b10.dist-info/METADATA,sha256=REFnPoTSJOcseg4yGal9OaGlf-Rr0uEpKVUt_X5Tpdg,2410
+django_camomilla_cms-6.0.0b10.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+django_camomilla_cms-6.0.0b10.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
+django_camomilla_cms-6.0.0b10.dist-info/RECORD,,

{django_camomilla_cms-6.0.0b8.dist-info → django_camomilla_cms-6.0.0b10.dist-info}/WHEEL

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