django-camomilla-cms 6.0.0b8__tar.gz → 6.0.0b10__tar.gz

{django-camomilla-cms-6.0.0b8/django_camomilla_cms.egg-info → django-camomilla-cms-6.0.0b10}/PKG-INFO

@@ -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 → django-camomilla-cms-6.0.0b10}/camomilla/__init__.py

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

{django-camomilla-cms-6.0.0b8 → django-camomilla-cms-6.0.0b10}/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

{django-camomilla-cms-6.0.0b8 → django-camomilla-cms-6.0.0b10}/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:

{django-camomilla-cms-6.0.0b8 → django-camomilla-cms-6.0.0b10}/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>

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

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

{django-camomilla-cms-6.0.0b8 → django-camomilla-cms-6.0.0b10/django_camomilla_cms.egg-info}/PKG-INFO

@@ -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 → django-camomilla-cms-6.0.0b10}/setup.py

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

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

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