django-camomilla-cms 6.1.4__tar.gz → 6.2.1__tar.gz

{django_camomilla_cms-6.1.4/django_camomilla_cms.egg-info → django_camomilla_cms-6.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-camomilla-cms
-Version: 6.1.4
+Version: 6.2.1
 Summary: Django powered cms
 Author-email: Lotrèk <dimmitutto@lotrek.it>
 License: MIT
@@ -17,7 +17,7 @@ License-File: LICENSE
 Requires-Dist: django-modeltranslation<=0.18.12,>=0.18.7
 Requires-Dist: djsuperadmin<1.0.0,>=0.9
 Requires-Dist: djangorestframework<=3.14.0,>=3.10.0
-Requires-Dist: django-structured-json-field>=1.1.1
+Requires-Dist: django-structured-json-field>=1.1.2
 Requires-Dist: Pillow>=10.0.0
 Requires-Dist: django-admin-interface<1.0.0,>=0.26.0
 Requires-Dist: django-ckeditor<7.0.0,>=5.7.1

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "6.1.4"
+__version__ = "6.2.1"
 
 
 def get_core_apps():

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/managers/pages.py

@@ -42,13 +42,44 @@ class PageQuerySet(QuerySet):
 
 
 class UrlNodeManager(models.Manager):
+
+    def get_reverse_pages_relations(self):
+        """
+        Get all reverse relations coming from AbstractPages models.
+        This is used to annotate the UrlNode with the related page fields.
+        """
+        from camomilla.models.page import AbstractPage
+
+        relations = []
+
+        for field in self.model._meta.get_fields():
+            if not (hasattr(field, "related_model") and field.one_to_one):
+                continue
+
+            if not issubclass(field.related_model, AbstractPage):
+                continue
+
+            if field.remote_field.name != "url_node":
+                continue
+
+            related_name = field.get_accessor_name()
+            relations.append(
+                {
+                    "name": related_name,
+                    "model": field.related_model,
+                    "field_name": field.remote_field.name,
+                    "field": field,
+                }
+            )
+        return relations
+
     @property
     def related_names(self):
-        self._related_names = getattr(
-            self,
-            "_related_names",
-            super().get_queryset().values_list("related_name", flat=True).distinct(),
-        )
+        self._related_names = getattr(self, "_related_names", None)
+        if self._related_names is None:
+            self._related_names = list(
+                set([rel["name"] for rel in self.get_reverse_pages_relations()])
+            )
         return self._related_names
 
     def _annotate_fields(

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/models/mixins/__init__.py

@@ -16,6 +16,7 @@ class SeoMixin(models.Model):
         on_delete=models.SET_NULL,
         related_name="%(app_label)s_%(class)s_og_images",
     )
+    keywords = models.CharField(max_length=200, blank=True, null=True)
 
     class Meta:
         abstract = True

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/models/page.py

@@ -99,7 +99,7 @@ class UrlNode(models.Model):
     LANG_PERMALINK_FIELDS = (
         [
             build_localized_fieldname("permalink", lang)
-            for lang in settings.AVAILABLE_LANGUAGES
+            for lang in settings.LANGUAGE_CODES
         ]
         if settings.ENABLE_TRANSLATIONS
         else ["permalink"]
@@ -319,7 +319,7 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
     @property
     def breadcrumbs(self) -> Sequence[dict]:
         breadcrumb = {
-            "permalink": self.permalink,
+            "permalink": self.routerlink,
             "title": self.breadcrumbs_title or self.title or "",
         }
         if self.parent:
@@ -481,6 +481,7 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
                 )
             if preview:
                 permalinks = {k: f"{v}?preview=true" for k, v in permalinks.items()}
+        permalinks.pop(get_language(), None)
         return permalinks
 
     class Meta:

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/serializers/mixins/translation.py

@@ -1,6 +1,5 @@
 from functools import cached_property
 from typing import Iterable, List
-from modeltranslation import settings as mt_settings
 from modeltranslation.translator import NotRegistered, translator
 from modeltranslation.utils import build_localized_fieldname
 from rest_framework import serializers
@@ -8,7 +7,7 @@ from rest_framework.exceptions import ValidationError
 from camomilla.utils.getters import pointed_getter
 from camomilla.utils.translation import is_translatable
 from camomilla.utils.translation import nest_to_plain, plain_to_nest
-from camomilla.settings import API_TRANSLATION_ACCESSOR
+from camomilla.settings import API_TRANSLATION_ACCESSOR, LANGUAGE_CODES
 
 
 class TranslationsMixin(serializers.ModelSerializer):
@@ -94,7 +93,7 @@ class RemoveTranslationsMixin(serializers.ModelSerializer):
             included_translations = []
 
         field_names = super().get_default_field_names(declared_fields, model_info)
-        for lang in mt_settings.AVAILABLE_LANGUAGES:
+        for lang in LANGUAGE_CODES:
             if lang not in included_translations:
                 for field in self.translation_fields:
                     localized_fieldname = build_localized_fieldname(field, lang)

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/serializers/user.py

@@ -91,6 +91,10 @@ class UserSerializer(BaseModelSerializer):
             "user_permissions",
             "has_token",
             "is_superuser",
+            "is_staff",
+            "is_active",
+            "date_joined",
+            "last_login",
         )
 
     def validate_password(self, value):

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/settings.py

@@ -105,6 +105,10 @@ INTEGRATIONS_ASTRO_URL = pointed_getter(
     django_settings, "CAMOMILLA.INTEGRATIONS.ASTRO.URL", ""
 )
 
+PAGE_ROUTER_CACHE = pointed_getter(
+    django_settings, "CAMOMILLA.API.PAGES.ROUTER_CACHE", 60 * 15
+)
+
 DEBUG = pointed_getter(django_settings, "CAMOMILLA.DEBUG", django_settings.DEBUG)
 
 # camomilla settings example
@@ -133,6 +137,13 @@ DEBUG = pointed_getter(django_settings, "CAMOMILLA.DEBUG", django_settings.DEBUG
 #             "URL": "http://localhost:4321"
 #         }
 #     }
-#     "API": {"NESTING_DEPTH": 10, "TRANSLATION_ACCESSOR": "translations", "PAGES": {"DEFAULT_SERIALIZER": "camomilla.serializers.page.RouteSerializer"}},
+#     "API": {
+#         "NESTING_DEPTH": 10,
+#         "TRANSLATION_ACCESSOR": "translations",
+#         "PAGES": {
+#             "DEFAULT_SERIALIZER": "camomilla.serializers.page.RouteSerializer"
+#         },
+#         "ROUTER_CACHE": 60 * 15
+#     },
 #     "DEBUG": False
 # }

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/templates/defaults/base.html

@@ -21,6 +21,8 @@
             justify-content: center;
             font-family: sans-serif;
             margin: 0;
+            width: 100vw;
+            height: 100vh;
         }
 
         .letter {

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/templates/defaults/parts/langswitch.html

@@ -36,6 +36,13 @@
         {% get_language_info_list for LANGUAGES as languages %}
         {% get_language_info for LANGUAGE_CODE as current_lang %}
 
+         <div class="language-switch--btn" data-lang="{{current_lang.code}}" 
+            {% if current_lang.code != LANGUAGE_CODE %} 
+                onclick="submitLanguageWithoutRedirect('{{current_lang.code}}');"
+            {% endif %}
+        >
+            <a>{{ current_lang.name_translated }} {% if current_lang.code == LANGUAGE_CODE %} 👾 {% endif %}</a>
+        </div>   
         {% for lang_code, redirect in page.alternate_urls.items %}
         <div class="language-switch--btn" data-lang="{{lang_code}}" 
             {% if current_lang.code != lang_code %} 

django_camomilla_cms-6.2.1/camomilla/theme/__init__.py

@@ -0,0 +1 @@
+__version__ = "6.2.1"

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/theme/admin/pages.py

@@ -29,7 +29,7 @@ class AbstractPageModelForm(
         super().__init__(*args, **kwargs)
         templates = [(t, t) for t in get_templates(request)]
         templates.insert(0, ("", "---------"))
-        self.fields["template"] = forms.ChoiceField(choices=templates)
+        self.fields["template"] = forms.ChoiceField(choices=templates, required=False)
 
     def get_initial_for_field(self, field, field_name):
         if field_name in UrlNode.LANG_PERMALINK_FIELDS:

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/translation.py

@@ -12,6 +12,7 @@ class SeoMixinTranslationOptions(TranslationOptions):
         "og_type",
         "og_url",
         "canonical",
+        "keywords",
     )
 
 

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/utils/translation.py

@@ -3,13 +3,12 @@ from typing import Any, Sequence, Iterator, Union, List
 
 from django.db.models import Model, Q
 from django.utils.translation.trans_real import activate, get_language
-from modeltranslation.settings import AVAILABLE_LANGUAGES, DEFAULT_LANGUAGE
 from modeltranslation.utils import build_localized_fieldname
-from camomilla.settings import BASE_URL
+from camomilla.settings import BASE_URL, DEFAULT_LANGUAGE, LANGUAGE_CODES
 from django.http import QueryDict
 
 
-def activate_languages(languages: Sequence[str] = AVAILABLE_LANGUAGES) -> Iterator[str]:
+def activate_languages(languages: Sequence[str] = LANGUAGE_CODES) -> Iterator[str]:
     old = get_language()
     for language in languages:
         activate(language)
@@ -37,7 +36,7 @@ def url_lang_decompose(url):
     if BASE_URL and url.startswith(BASE_URL):
         url = url[len(BASE_URL) :]
     data = {"url": url, "permalink": url, "language": DEFAULT_LANGUAGE}
-    result = re.match(rf"^/?({'|'.join(AVAILABLE_LANGUAGES)})?/(.*)", url)  # noqa: W605
+    result = re.match(rf"^/?({'|'.join(LANGUAGE_CODES)})?/(.*)", url)  # noqa: W605
     groups = result and result.groups()
     if groups and len(groups) == 2:
         data["language"] = groups[0]
@@ -48,14 +47,14 @@ def url_lang_decompose(url):
 def get_field_translations(instance: Model, field_name: str, *args, **kwargs):
     return {
         lang: get_nofallbacks(instance, field_name, language=lang, *args, **kwargs)
-        for lang in AVAILABLE_LANGUAGES
+        for lang in LANGUAGE_CODES
     }
 
 
 def lang_fallback_query(**kwargs):
     current_lang = get_language()
     query = Q()
-    for lang in AVAILABLE_LANGUAGES:
+    for lang in LANGUAGE_CODES:
         query |= Q(**{f"{key}_{lang}": value for key, value in kwargs.items()})
     if current_lang:
         query = query & Q(
@@ -77,7 +76,7 @@ def plain_to_nest(data, fields, accessor="translations"):
     into a dictionary with nested translations fields (es. {"translations": {"en": {"title": "Hello"}}}).
     """
     trans_data = {}
-    for lang in AVAILABLE_LANGUAGES:
+    for lang in LANGUAGE_CODES:
         lang_data = {}
         for field in fields:
             trans_field_name = build_localized_fieldname(field, lang)
@@ -101,7 +100,7 @@ def nest_to_plain(
     if isinstance(data, QueryDict):
         data = data.dict()
     translations = data.pop(accessor, {})
-    for lang in AVAILABLE_LANGUAGES:
+    for lang in LANGUAGE_CODES:
         nest_trans = translations.pop(lang, {})
         for k in fields:
             data.pop(k, None)  # this removes all trans field without lang

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/views/articles.py

@@ -1,5 +1,4 @@
 from camomilla.models import Article
-from camomilla.permissions import CamomillaBasePermissions
 from camomilla.serializers import ArticleSerializer
 from camomilla.views.base import BaseModelViewset
 from camomilla.views.mixins import BulkDeleteMixin, GetUserLanguageMixin
@@ -8,6 +7,5 @@ from camomilla.views.mixins import BulkDeleteMixin, GetUserLanguageMixin
 class ArticleViewSet(GetUserLanguageMixin, BulkDeleteMixin, BaseModelViewset):
     queryset = Article.objects.all()
     serializer_class = ArticleSerializer
-    permission_classes = (CamomillaBasePermissions,)
     search_fields = ["title", "identifier", "content", "permalink"]
     model = Article

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/views/contents.py

@@ -4,7 +4,6 @@ from django.http import JsonResponse
 from rest_framework.decorators import action
 
 from camomilla.models import Content
-from camomilla.permissions import CamomillaBasePermissions
 from camomilla.serializers import ContentSerializer
 from camomilla.views.base import BaseModelViewset
 from camomilla.views.mixins import BulkDeleteMixin, GetUserLanguageMixin
@@ -14,7 +13,6 @@ class ContentViewSet(GetUserLanguageMixin, BulkDeleteMixin, BaseModelViewset):
     queryset = Content.objects.all()
     serializer_class = ContentSerializer
     model = Content
-    permission_classes = (CamomillaBasePermissions,)
 
     @action(detail=True, methods=["get", "patch"])
     def djsuperadmin(self, request, pk):

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/views/decorators.py

@@ -1,6 +1,7 @@
 import functools
 from django.utils.translation import activate
-from django.conf import settings
+from django.views.decorators.cache import cache_page
+from camomilla.settings import LANGUAGE_CODES, DEFAULT_LANGUAGE
 
 
 def active_lang(*args, **kwargs):
@@ -11,12 +12,12 @@ def active_lang(*args, **kwargs):
                 request = args[0].request
             else:
                 request = args[0] if len(args) else kwargs.get("request", None)
-            lang = settings.LANGUAGE_CODE
+            lang = DEFAULT_LANGUAGE
             if request and hasattr(request, "GET"):
                 lang = request.GET.get("lang", request.GET.get("language", lang))
             if request and hasattr(request, "data"):
                 lang = request.data.pop("lang", request.data.pop("language", lang))
-            if lang and lang in [lng[0] for lng in settings.LANGUAGES]:
+            if lang and lang in LANGUAGE_CODES:
                 activate(lang)
                 request.LANGUAGE_CODE = lang
             return func(*args, **kwargs)
@@ -24,3 +25,22 @@ def active_lang(*args, **kwargs):
         return wrapped_func
 
     return decorator
+
+
+def staff_excluded_cache(timing=None):
+    def decorator(func):
+        if timing is None:
+            return func  # No caching applied
+
+        @functools.wraps(func)
+        def wrapped_func(*args, **kwargs):
+            request = args[0] if len(args) else kwargs.get("request", None)
+            if request and hasattr(request, "user"):
+                user = request.user
+                if user.is_authenticated and user.is_staff:
+                    return func(*args, **kwargs)
+            return cache_page(timing)(func)(*args, **kwargs)
+
+        return wrapped_func
+
+    return decorator

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/views/medias.py

@@ -3,7 +3,6 @@ from rest_framework.response import Response
 
 from camomilla.models import Media, MediaFolder
 from camomilla.parsers import MultipartJsonParser
-from camomilla.permissions import CamomillaBasePermissions
 from camomilla.serializers import (
     MediaFolderSerializer,
     MediaListSerializer,
@@ -33,7 +32,6 @@ class MediaFolderViewSet(
 ):
     model = MediaFolder
     serializer_class = MediaFolderSerializer
-    permission_classes = (CamomillaBasePermissions,)
     items_per_page = 18
     search_fields = ["title", "alt_text", "file"]
 
@@ -85,6 +83,5 @@ class MediaViewSet(
 ):
     queryset = Media.objects.all()
     serializer_class = MediaSerializer
-    permission_classes = (CamomillaBasePermissions,)
     model = Media
     parser_classes = [MultipartJsonParser, JSONParser]

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/views/menus.py

@@ -7,7 +7,6 @@ from rest_framework.response import Response
 
 from camomilla.models import AbstractPage, Menu
 from camomilla.models.page import UrlNode
-from camomilla.permissions import CamomillaBasePermissions
 from camomilla.serializers import ContentTypeSerializer, MenuSerializer
 from camomilla.serializers.page import UrlNodeSerializer
 from camomilla.views.base import BaseModelViewset
@@ -17,7 +16,6 @@ from camomilla.views.decorators import active_lang
 class MenuViewSet(BaseModelViewset):
     queryset = Menu.objects.all()
     serializer_class = MenuSerializer
-    permission_classes = (CamomillaBasePermissions,)
     model = Menu
 
     lookup_field = "key"

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/views/pages.py

@@ -1,26 +1,27 @@
 from camomilla.models import Page
 from camomilla.models.page import UrlNode, UrlRedirect
-from camomilla.permissions import CamomillaBasePermissions
 from camomilla.serializers import PageSerializer
 from camomilla.serializers.page import RouteSerializer
+from camomilla.utils.translation import url_lang_decompose
 from camomilla.views.base import BaseModelViewset
-from camomilla.views.decorators import active_lang
+from camomilla.views.decorators import staff_excluded_cache
 from camomilla.views.mixins import BulkDeleteMixin, GetUserLanguageMixin
 from rest_framework.decorators import api_view, permission_classes
 from rest_framework.response import Response
 from rest_framework import permissions
+from django.utils.translation.trans_real import activate as activate_language
 from django.shortcuts import get_object_or_404
+from camomilla.settings import PAGE_ROUTER_CACHE
 
 
 class PageViewSet(GetUserLanguageMixin, BulkDeleteMixin, BaseModelViewset):
     queryset = Page.objects.all()
     serializer_class = PageSerializer
-    permission_classes = (CamomillaBasePermissions,)
     model = Page
 
 
-@active_lang()
 @api_view(["GET"])
+@staff_excluded_cache(PAGE_ROUTER_CACHE)
 @permission_classes(
     [
         permissions.AllowAny,
@@ -31,5 +32,9 @@ def pages_router(request, permalink=""):
     if redirect:
         redirect = redirect.redirect()
         return Response({"redirect": redirect.url, "status": redirect.status_code})
-    node: UrlNode = get_object_or_404(UrlNode, permalink=f"/{permalink}")
+    url_decomposition = url_lang_decompose(permalink)
+    if not url_decomposition["permalink"].startswith("/"):
+        url_decomposition["permalink"] = f"/{url_decomposition['permalink']}"
+    activate_language(url_decomposition["language"])
+    node: UrlNode = get_object_or_404(UrlNode, permalink=url_decomposition["permalink"])
     return Response(RouteSerializer(node, context={"request": request}).data)

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/views/tags.py

@@ -1,5 +1,4 @@
 from camomilla.models import Tag
-from camomilla.permissions import CamomillaBasePermissions
 from camomilla.serializers import TagSerializer
 from camomilla.views.base import BaseModelViewset
 from camomilla.views.mixins import BulkDeleteMixin, GetUserLanguageMixin
@@ -8,5 +7,4 @@ from camomilla.views.mixins import BulkDeleteMixin, GetUserLanguageMixin
 class TagViewSet(GetUserLanguageMixin, BulkDeleteMixin, BaseModelViewset):
     queryset = Tag.objects.all()
     serializer_class = TagSerializer
-    permission_classes = (CamomillaBasePermissions,)
     model = Tag

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/camomilla/views/users.py

@@ -8,7 +8,7 @@ from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from camomilla.permissions import CamomillaBasePermissions, CamomillaSuperUser, ReadOnly
+from camomilla.permissions import CamomillaSuperUser, ReadOnly
 from camomilla.serializers import (
     PermissionSerializer,
     UserProfileSerializer,
@@ -30,7 +30,6 @@ class UserViewSet(BaseModelViewset):
     queryset = get_user_model().objects.all()
     serializer_class = UserSerializer
     model = get_user_model()
-    permission_classes = (CamomillaSuperUser | CamomillaBasePermissions,)
 
     @action(detail=False, methods=["get", "put"], permission_classes=(IsAuthenticated,))
     def current(self, request):

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1/django_camomilla_cms.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-camomilla-cms
-Version: 6.1.4
+Version: 6.2.1
 Summary: Django powered cms
 Author-email: Lotrèk <dimmitutto@lotrek.it>
 License: MIT
@@ -17,7 +17,7 @@ License-File: LICENSE
 Requires-Dist: django-modeltranslation<=0.18.12,>=0.18.7
 Requires-Dist: djsuperadmin<1.0.0,>=0.9
 Requires-Dist: djangorestframework<=3.14.0,>=3.10.0
-Requires-Dist: django-structured-json-field>=1.1.1
+Requires-Dist: django-structured-json-field>=1.1.2
 Requires-Dist: Pillow>=10.0.0
 Requires-Dist: django-admin-interface<1.0.0,>=0.26.0
 Requires-Dist: django-ckeditor<7.0.0,>=5.7.1

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/django_camomilla_cms.egg-info/SOURCES.txt

@@ -132,9 +132,14 @@ tests/test_models.py
 tests/test_page_meta.py
 tests/test_page_relation_api.py
 tests/test_pages.py
+tests/test_parsers.py
 tests/test_query_parser.py
+tests/test_sitemap.py
 tests/test_templates_context.py
 tests/test_utils.py
+tests/test_utils_getters.py
+tests/test_utils_normalization.py
+tests/test_utils_setters.py
 tests/fixtures/__init__.py
 tests/utils/__init__.py
 tests/utils/api.py

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/django_camomilla_cms.egg-info/requires.txt

@@ -1,7 +1,7 @@
 django-modeltranslation<=0.18.12,>=0.18.7
 djsuperadmin<1.0.0,>=0.9
 djangorestframework<=3.14.0,>=3.10.0
-django-structured-json-field>=1.1.1
+django-structured-json-field>=1.1.2
 Pillow>=10.0.0
 django-admin-interface<1.0.0,>=0.26.0
 django-ckeditor<7.0.0,>=5.7.1

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/pyproject.toml

@@ -15,7 +15,7 @@ dependencies = [
   "django-modeltranslation>=0.18.7,<=0.18.12",
   "djsuperadmin>=0.9,<1.0.0",
   "djangorestframework>=3.10.0,<=3.14.0",
-  "django-structured-json-field>=1.1.1",
+  "django-structured-json-field>=1.1.2",
   "Pillow>=10.0.0",
   "django-admin-interface>=0.26.0,<1.0.0",
   "django-ckeditor>=5.7.1,<7.0.0",
@@ -60,3 +60,10 @@ prerelease = false
 match = "next"
 prerelease = true
 prerelease_token = "beta"
+
+[tool.semantic_release.changelog]
+mode = "update"
+
+[tool.semantic_release.changelog.default_templates]
+changelog_file = "CHANGELOG.md"
+output_format = "md"

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/setup.py

@@ -1,5 +1,5 @@
 from setuptools import setup
 
-__version__ = "6.1.4"
+__version__ = "6.2.1"
 
 setup(version=__version__)

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/tests/test_admin_page_form.py

@@ -36,7 +36,7 @@ class AdminPageFormTestCase(TestCase):
 
         page_admin = PageAdmin(Page, AdminSite())
         form = page_admin.get_form(request)()
-        self.assertEqual(len(list(form.fields)), 33)
+        self.assertEqual(len(list(form.fields)), 35)
         self.assertTrue("template" in list(form.fields))
         self.assertListEqual(
             form.fields["template"].widget.choices,
@@ -54,7 +54,7 @@ class AdminPageFormTestCase(TestCase):
 
         page_admin = PageAdmin(Page, AdminSite())
         form = page_admin.get_form(request_with_cookies)()
-        self.assertEqual(len(list(form.fields)), 33)
+        self.assertEqual(len(list(form.fields)), 35)
         self.assertTrue("template" in list(form.fields))
         self.assertListEqual(
             form.fields["template"].widget.choices,

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/tests/test_camomilla_filters.py

@@ -42,4 +42,4 @@ class CamomillaFiltersTestCase(TestCase):
         request.META["HTTP_HOST"] = "localhost"
         page = Page.get(request)
         alt_urls = dict(alternate_urls(page, request))
-        self.assertEqual(alt_urls, {"it": None, "en": "/path/"})
+        self.assertEqual(alt_urls, {"it": None})

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/tests/test_model_api_permissions.py

@@ -9,14 +9,20 @@ client = APIClient()
 def test_right_permissions():
     response = client.post("/api/models/test-model/", {"title": "test"}, format="json")
     assert response.status_code == 401
+    response = client.get("/api/models/test-model/")
+    assert response.status_code == 401
     token = login_user()
     client.credentials(HTTP_AUTHORIZATION="Token " + token)
     response = client.post("/api/models/test-model/", {"title": "test"}, format="json")
     assert response.status_code == 403
+    response = client.get("/api/models/test-model/")
+    assert response.status_code == 200
     token = login_staff()
     client.credentials(HTTP_AUTHORIZATION="Token " + token)
     response = client.post("/api/models/test-model/", {"title": "test"}, format="json")
     assert response.status_code == 403
+    response = client.get("/api/models/test-model/")
+    assert response.status_code == 200
     token = login_superuser()
     client.credentials(HTTP_AUTHORIZATION="Token " + token)
     response = client.post("/api/models/test-model/", {"title": "test"}, format="json")

{django_camomilla_cms-6.1.4 → django_camomilla_cms-6.2.1}/tests/test_pages.py

@@ -347,3 +347,21 @@ class PagesTestCase(TestCase):
         response = self.client.get("/it/permalink_6_it/")
         assert response.status_code == 301
         assert response.url == "/it/permalink_6_it_changed/"
+
+    @pytest.mark.django_db
+    def test_page_keywords(self):
+        # Create page with keywords field and check it's given back as expected
+        response = self.client.post(
+            "/api/camomilla/pages/",
+            {
+                "og_description_it" : "Keywords Test",
+                "keywords_it" : 'key1, key2'
+            },
+            format="json",
+        )
+
+        assert response.status_code == 201
+        assert len(Page.objects.all()) == 1
+        page = Page.objects.first()
+        assert page.og_description_it == "Keywords Test"
+        assert page.keywords_it == 'key1, key2'