django-camomilla-cms 6.0.0b18__py2.py3-none-any.whl → 6.0.1__py2.py3-none-any.whl

camomilla/__init__.py

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

camomilla/models/page.py

@@ -10,7 +10,6 @@ from django.http import Http404, HttpRequest
 from django.shortcuts import redirect
 from django.urls import NoReverseMatch, reverse
 from django.utils import timezone
-from django.utils.functional import lazy
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import get_language
@@ -24,7 +23,6 @@ from camomilla.utils import (
     lang_fallback_query,
     set_nofallbacks,
     url_lang_decompose,
-    get_all_templates_files,
 )
 from camomilla.utils.getters import pointed_getter
 from camomilla import settings
@@ -33,10 +31,6 @@ from django.conf import settings as django_settings
 from modeltranslation.utils import build_localized_fieldname
 
 
-def GET_TEMPLATE_CHOICES():
-    return [(t, t) for t in get_all_templates_files()]
-
-
 class UrlRedirect(models.Model):
     language_code = models.CharField(max_length=10, null=True)
     from_url = models.CharField(max_length=400)
@@ -233,7 +227,7 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
     date_created = models.DateTimeField(auto_now_add=True)
     date_updated_at = models.DateTimeField(auto_now=True)
     breadcrumbs_title = models.CharField(max_length=128, null=True, blank=True)
-    template = models.CharField(max_length=500, null=True, blank=True, choices=[])
+    template = models.CharField(max_length=500, null=True, blank=True)
     template_data = models.JSONField(default=dict, null=False, blank=True)
     ordering = models.PositiveIntegerField(default=0, blank=False, null=False)
     parent_page = models.ForeignKey(
@@ -276,7 +270,6 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
 
     def __init__(self, *args, **kwargs):
         super(AbstractPage, self).__init__(*args, **kwargs)
-        self._meta.get_field("template").choices = lazy(GET_TEMPLATE_CHOICES, list)()
 
     def __str__(self) -> str:
         return "(%s) %s" % (self.__class__.__name__, self.title or self.permalink)

camomilla/serializers/base/__init__.py

@@ -9,18 +9,22 @@ from camomilla.serializers.mixins import (
     FieldsOverrideMixin,
     TranslationsMixin,
 )
+from camomilla.settings import ENABLE_TRANSLATIONS
 
-
-class BaseModelSerializer(
+bases = (
     SetupEagerLoadingMixin,
     NestMixin,
     FilterFieldsMixin,
     FieldsOverrideMixin,
     JSONFieldPatchMixin,
     OrderingMixin,
-    TranslationsMixin,
-    serializers.ModelSerializer,
-):
+)
+
+if ENABLE_TRANSLATIONS:
+    bases += (TranslationsMixin,)
+
+
+class BaseModelSerializer(*bases, serializers.ModelSerializer):
     """
     This is the base serializer for all the models.
     It adds support for:

camomilla/settings.py

@@ -88,8 +88,15 @@ API_TRANSLATION_ACCESSOR = pointed_getter(
 )
 
 REGISTERED_TEMPLATES_APPS = pointed_getter(
-    django_settings,
-    "CAMOMILLA.RENDER.REGISTERED_TEMPLATES_APPS", None
+    django_settings, "CAMOMILLA.RENDER.REGISTERED_TEMPLATES_APPS", None
+)
+
+INTEGRATIONS_ASTRO_ENABLE = pointed_getter(
+    django_settings, "CAMOMILLA.INTEGRATIONS.ASTRO.ENABLE", False
+)
+
+INTEGRATIONS_ASTRO_URL = pointed_getter(
+    django_settings, "CAMOMILLA.INTEGRATIONS.ASTRO.URL", ""
 )
 
 DEBUG = pointed_getter(django_settings, "CAMOMILLA.DEBUG", django_settings.DEBUG)
@@ -114,6 +121,12 @@ DEBUG = pointed_getter(django_settings, "CAMOMILLA.DEBUG", django_settings.DEBUG
 #     "STRUCTURED_FIELD": {
 #         "CACHE_ENABLED": True
 #     }
+#     "INTEGRATIONS": {
+#         "ASTRO": {
+#             "ENABLE": True,
+#             "URL": "http://localhost:4321"
+#         }
+#     }
 #     "API": {"NESTING_DEPTH": 10, "TRANSLATION_ACCESSOR": "translations"},
 #     "DEBUG": False
 # }

camomilla/templatetags/model_extras.py

@@ -42,13 +42,17 @@ def pretty_dict(data, indent_level=0):
                 if isinstance(item, dict):
                     result.append(pretty_dict(item, indent_level + 1))
                 else:
-                    result.append(f"{indent}  {json.dumps(item, default=custom_json_serializer)},")
+                    result.append(
+                        f"{indent}  {json.dumps(item, default=custom_json_serializer)},"
+                    )
             result.append(f"{indent}],")
 
         else:
-            result.append(f"{indent}'{key}': {json.dumps(value, default=custom_json_serializer)},")
+            result.append(
+                f"{indent}'{key}': {json.dumps(value, default=custom_json_serializer)},"
+            )
 
-    return "\n".join(result).rstrip(',')
+    return "\n".join(result).rstrip(",")
 
 
 @register.filter
@@ -67,7 +71,7 @@ def to_pretty_dict(instance):
     highlighted = re.sub(
         r"(')([^&#]+?)('):",
         r"<span style='color:#df3079'>'\2'</span>:",
-        escaped
+        escaped,
     )
 
     return mark_safe(f"<pre>{highlighted}</pre>")

camomilla/theme/__init__.py

@@ -1 +1 @@
-__version__ = "6.0.0-beta.18"
+__version__ = "6.0.1"

camomilla/theme/admin/pages.py

@@ -3,6 +3,8 @@ from camomilla import settings
 from .translations import TranslationAwareModelAdmin
 from camomilla.models import UrlNode
 
+from camomilla.utils import get_templates
+
 
 class AbstractPageModelFormMeta(forms.models.ModelFormMetaclass):
     def __new__(mcs, name, bases, attrs):
@@ -22,6 +24,12 @@ class AbstractPageModelFormMeta(forms.models.ModelFormMetaclass):
 class AbstractPageModelForm(
     forms.models.BaseModelForm, metaclass=AbstractPageModelFormMeta
 ):
+    def __init__(self, *args, **kwargs):
+        request = kwargs.pop("request", None)
+        super().__init__(*args, **kwargs)
+        templates = [(t, t) for t in get_templates(request)]
+        templates.insert(0, ("", "---------"))
+        self.fields["template"] = forms.ChoiceField(choices=templates)
 
     def get_initial_for_field(self, field, field_name):
         if field_name in UrlNode.LANG_PERMALINK_FIELDS:
@@ -43,4 +51,16 @@ class AbstractPageModelForm(
 
 class AbstractPageAdmin(TranslationAwareModelAdmin):
     form = AbstractPageModelForm
+
+    def get_form(self, request, obj=None, **kwargs):
+        kwargs["form"] = self.form
+        form = super().get_form(request, obj, **kwargs)
+
+        class FormWithRequest(form):
+            def __new__(cls, *args, **kwargs_):
+                kwargs_["request"] = request
+                return form(*args, **kwargs_)
+
+        return FormWithRequest
+
     change_form_template = "admin/camomilla/page/change_form.html"

camomilla/utils/templates.py

@@ -1,33 +1,53 @@
 from pathlib import Path
 from typing import Sequence
+import requests
 
 from django import template as django_template
 from os.path import relpath
-from camomilla.settings import REGISTERED_TEMPLATES_APPS
+from camomilla.settings import (
+    REGISTERED_TEMPLATES_APPS,
+    INTEGRATIONS_ASTRO_ENABLE,
+    INTEGRATIONS_ASTRO_URL,
+)
 
 
-def get_all_templates_files() -> Sequence[str]:
+def get_templates(request=None) -> Sequence[str]:
     files = []
 
     for engine in django_template.loader.engines.all():
 
         if REGISTERED_TEMPLATES_APPS:
             dirs = [
-                d for d in engine.template_dirs
+                d
+                for d in engine.template_dirs
                 if any(app in str(d) for app in REGISTERED_TEMPLATES_APPS)
             ]
         else:
             # Exclude pip installed site package template dirs
             dirs = [
-                d for d in engine.template_dirs
+                d
+                for d in engine.template_dirs
                 if "site-packages" not in str(d) or "camomilla" in str(d)
             ]
 
         for d in dirs:
             base = Path(d)
-            files.extend(
-                relpath(f, d)
-                for f in base.rglob("*.html")
+            files.extend(relpath(f, d) for f in base.rglob("*.html"))
+
+    if INTEGRATIONS_ASTRO_ENABLE and request is not None:
+        try:
+            response = requests.get(
+                INTEGRATIONS_ASTRO_URL + "/api/templates",
+                cookies={
+                    "sessionid": request.COOKIES.get("sessionid"),
+                    "csrftoken": request.COOKIES.get("csrftoken"),
+                },
             )
+            if response.status_code == 200:
+                astro_templates = response.json()
+                for template in astro_templates:
+                    files.append(template)
+        except:
+            pass
 
     return files

camomilla/views/base/__init__.py

@@ -4,6 +4,8 @@ from ..mixins import (
     OrderingMixin,
     CamomillaBasePermissionMixin,
 )
+from camomilla.serializers.mixins import TranslationsMixin
+from camomilla.utils.translation import plain_to_nest
 from rest_framework import viewsets
 from rest_framework.metadata import SimpleMetadata
 from structured.contrib.restframework import StructuredJSONField
@@ -29,8 +31,8 @@ class BaseViewMetadata(SimpleMetadata):
 
     def get_serializer_info(self, serializer):
         info = super().get_serializer_info(serializer)
-        if hasattr(serializer, "plain_to_nest"):
-            info.update(serializer.plain_to_nest(info))
+        if isinstance(serializer, TranslationsMixin) and serializer.is_translatable:
+            info.update(plain_to_nest(info, serializer.translation_fields))
         return info
 
 

camomilla/views/mixins/pagination.py

@@ -86,7 +86,7 @@ class PaginateStackMixin:
             if "sqlite" in settings.DATABASES["default"]["ENGINE"]:
                 filter_statement = Q()
                 for field in search_fields:
-                    filter_statement |= Q(**{field + '__icontains': search_string})
+                    filter_statement |= Q(**{field + "__icontains": search_string})
                 return list_handler.filter(filter_statement)
             else:
                 return list_handler.annotate(

django_camomilla_cms-6.0.1.dist-info/METADATA

@@ -0,0 +1,133 @@
+Metadata-Version: 2.4
+Name: django-camomilla-cms
+Version: 6.0.1
+Summary: Django powered cms
+Author-email: Lotrèk <dimmitutto@lotrek.it>
+License: MIT
+Project-URL: Homepage, https://github.com/camomillacms/camomilla-core
+Keywords: cms,django,api cms
+Classifier: Environment :: Web Environment
+Classifier: Framework :: Django
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Requires-Python: <=3.13,>=3.8
+Description-Content-Type: text/markdown
+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>=0.4.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
+Requires-Dist: django-tinymce<5.0.0,>=4.1.0
+Requires-Dist: python-magic<0.5,>=0.4
+Requires-Dist: Django<6,>=3.2
+Requires-Dist: django_jsonform>=2.23
+Requires-Dist: inflection>=0.5.1
+Requires-Dist: uritemplate>=4.1.0
+Dynamic: license-file
+
+[![PyPI](https://img.shields.io/pypi/v/django-camomilla-cms?style=flat-square)](https://pypi.org/project/django-camomilla-cms)
+[![Django Versions](https://img.shields.io/badge/django-3.2%20%7C%204.2%20%7C%205.1-blue?style=flat-square)](https://www.djangoproject.com/)
+[![Build](https://img.shields.io/github/actions/workflow/status/camomillacms/camomilla-core/ci.yml?branch=master&style=flat-square)](https://github.com/camomillacms/camomilla-core/actions)
+[![Last Commit](https://img.shields.io/github/last-commit/camomillacms/camomilla-core?style=flat-square)](https://github.com/camomillacms/camomilla-core/commits/master)
+[![Contributors](https://img.shields.io/github/contributors/camomillacms/camomilla-core?style=flat-square)](https://github.com/camomillacms/camomilla-core/graphs/contributors)
+[![Open Issues](https://img.shields.io/github/issues/camomillacms/camomilla-core?style=flat-square)](https://github.com/camomillacms/camomilla-core/issues)
+[![Codecov](https://img.shields.io/codecov/c/github/camomillacms/camomilla-core?style=flat-square)](https://app.codecov.io/gh/camomillacms/camomilla-core/tree/master/camomilla)
+[![License](https://img.shields.io/github/license/camomillacms/camomilla-core?style=flat-square)](./LICENSE)
+
+
+<br>
+<br>
+<br>
+<br>
+<div align="center">
+    <picture>
+        <source media="(prefers-color-scheme: dark)" srcset="https://camomillacms.github.io/camomilla-core/images/camomilla-logo-dark.svg?v=1">
+        <source media="(prefers-color-scheme: light)" srcset="https://camomillacms.github.io/camomilla-core/images/camomilla-logo-light.svg?v=1">
+        <img alt="Fallback image description" src="https://camomillacms.github.io/camomilla-core/images/camomilla-logo-light.svg?v=1" style="width: 250px; height: auto;">
+    </picture>
+</div>
+<h3 align="center"">Our beloved Django CMS</h3>
+<br>
+
+## ⭐️ Features
+
+<!-- Highlight some of the features your module provide here -->
+
+- 🧘‍♀️ &nbsp;Built on top of the django framework
+- 🥨 &nbsp;Beaked page abstract model to let you manage everything you need as a page.
+- 🏞️ &nbsp;Optimized media management with autoresize
+- 👯 &nbsp;Enable relations inside django JSONFields
+- ⚡️ &nbsp;AutoCreate api endpoints from models
+- 🚧 &nbsp;Enable JsonSchema directly in models endpoints
+
+Camomilla is a Django CMS that allows you to create and manage your website's content with ease. It provides a simple and intuitive interface for managing pages, media, and other content types. Camomilla is built on top of the Django framework, which means it inherits all the features and benefits of Django framework.
+We try to continuously improve Camomilla by adding new features and fixing bugs. You can check the [CHANGELOG](./CHANGELOG.md) to see what has been added in the latest releases.
+
+## 📦 Quick Start
+
+Here you can find some quick setup instructions to get started with Camomilla. For more detailed information, please refer to the [documentation](https://camomillacms.github.io/camomilla-core/).
+
+> [!TIP]
+>
+> #### Env Virtualization 👾
+>
+> Use a virtualenv to isolate your project's dependencies from the system's python installation before starting. Check out [virtualenvwrapper](https://virtualenvwrapper.readthedocs.io/en/latest/) for more information.
+
+Install django-camomilla-cms and django from pip
+
+```bash
+$ pip install django
+$ pip install django-camomilla-cms==6.0.0
+```
+
+Create a new django project
+
+```bash
+$ django-admin startproject <project_name>
+$ cd <project_name>
+```
+
+Create a dedicated folder for camomilla migrations
+
+```bash
+$ mkdir -p camomilla_migrations
+$ touch camomilla_migrations.__init__.py
+```
+
+Create migrations and prepare the database
+
+```bash
+$ python manage.py makemigrations camomilla
+$ python manage.py migrate
+```
+
+Add camomilla and camomilla dependencies to your project's INSTALLED_APPS
+
+```python
+# <project_name>/settings.py
+
+INSTALLED_APPS = [
+    ...
+    'camomilla', # always needed
+    'camomilla.theme', # needed to customize admin interface
+    'djsuperadmin', # needed if you whant to use djsuperadmin for contents
+    'modeltranslation', # needed if your website is multilanguage (can be added later)
+    'rest_framework',  # always needed
+    'rest_framework.authtoken',  # always needed
+    ...
+]
+```
+
+Run the server
+
+```bash
+$ python manage.py runserver
+```
+
+## 🧑‍💻 How to Contribute
+
+We welcome contributions to Camomilla! If you want to contribute, please read our [contributing guide](./CONTRIBUTING.md) for more information on how to get started.

{django_camomilla_cms-6.0.0b18.dist-info → django_camomilla_cms-6.0.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-camomilla/__init__.py,sha256=rVNwuy2J-skWorDHQHY5RbR836EfOwG8yJmEDdWPZEE,251
+camomilla/__init__.py,sha256=Chd2aJ9tllc6G4Js9yDbwgQf9Z4QYydv95s0ijUTuIc,243
 camomilla/apps.py,sha256=eUwb9ynyiRAc5OXgt7ZsAdhsCOnPCpNdIFYMheNeN-o,532
 camomilla/authentication.py,sha256=jz6tQT4PPEu-_JLox1LZrOy7EiWBb9MWaObK63MJGus,855
 camomilla/context_processors.py,sha256=cGowjDZ-oDGYn1j2Pj5QDGCqnzXAOdOwp5dmzin_FTc,165
@@ -9,7 +9,7 @@ camomilla/model_api.py,sha256=-7l3fc2eN1itCMzkWA8nFaQXMmz0vs7IlGlShF-gSuo,2487
 camomilla/parsers.py,sha256=fL8XGCGPxJIZNZkPdGtnPSbDP-6-yzGOCVMuLPjkx9Y,1975
 camomilla/permissions.py,sha256=9NlBO4JMmg36vXCUjPNyq6uZxhkdrnXyIbJVLtWhGWE,1813
 camomilla/redirects.py,sha256=ilcyHidb5Iw3jTrXMnPntr50kkl_WB3QOB0VNkIxP7A,263
-camomilla/settings.py,sha256=V9rf42MSAwJoGlJS-yAW5pzgGcu5J1g7rrVCAmRtMJU,3763
+camomilla/settings.py,sha256=yyQFUHAIyzqemWFbwvBCUPGQuB7KmhmnH_Mu9J20SQI,4116
 camomilla/sitemap.py,sha256=U2t5TwhB_-sEscmQZ69PZ5st3bIap8NRxzWEvCgB130,786
 camomilla/translation.py,sha256=_QyfTlKG6hQ_ClRfxzeJ-3oI3Nu5peJN9xFkO9Ib3As,1316
 camomilla/urls.py,sha256=XgaeFoG2eXlJQve3KmFKlD-74CMLW1ziaY1mq-lrAiA,2095
@@ -28,7 +28,7 @@ camomilla/models/article.py,sha256=LgkZgRsubtDV6NwBz8E2bIgKD6H3I-1QLAxEan5TYYs,1
 camomilla/models/content.py,sha256=mIgtifb_WMIt58we5u6qWZemHvuDN1zZaBeCyzHL78A,956
 camomilla/models/media.py,sha256=pD-qldiHDOOHgux4lsivQLBcOJJrRx3a4Bg8ODNx7r0,6852
 camomilla/models/menu.py,sha256=hUszPcn1prWCDhk4RPvbITmyhsB2CjFkaerx9t1GWnc,3766
-camomilla/models/page.py,sha256=lkZPdPkl8Yxpz_NfYrpr7Myp8hB3bEAGtdJwKBR7_cg,19385
+camomilla/models/page.py,sha256=czbiKiEje4mj229_XsLMv1mOr7JzbnAD-MIMvSb9tF0,19132
 camomilla/models/mixins/__init__.py,sha256=c2NixqvrIX4E9WGRqQbylXlqBWDXEqN9mzs_dpB0hFQ,1248
 camomilla/openapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 camomilla/openapi/schema.py,sha256=C22dhKjaJ2DTK4KWFjyMJXiwe8NLy7ZTW5d-I1dqZ7g,2546
@@ -41,7 +41,7 @@ camomilla/serializers/page.py,sha256=NNjEypVYu_9iKqdHV_-61ea37gxiHlDP5gsloV_i6yg
 camomilla/serializers/user.py,sha256=CzrHiVRvYYWNE4eNpCNKtJB7DjVqHHwIcP4NUBXMHSo,3706
 camomilla/serializers/utils.py,sha256=XRL4CNwQDBNpX8xT7365Dw2Cyx8Kvh18GaadgjS9awk,968
 camomilla/serializers/validators.py,sha256=X2uBlh348nJjUWHPtiu9XKCD7Etsdg0811a4xHLAUzU,2103
-camomilla/serializers/base/__init__.py,sha256=maaL3y6tvc5Ph9y07KVcMvZVYTkzh_3aBiBnGCoi1EA,799
+camomilla/serializers/base/__init__.py,sha256=fAUS9AZe61Nj_LlqOpImwLsW5QHG7i-SqbdorREmYPc,900
 camomilla/serializers/fields/__init__.py,sha256=0I_E9oMtlC0H48LjStMQZiZ-Ycoy49nWK9GvA5JWxN8,145
 camomilla/serializers/fields/file.py,sha256=yjKMho2ti9TIAzo6nwyLnNPJ6GVUumL2wxhegvYqI2o,800
 camomilla/serializers/fields/related.py,sha256=qQQeUxIZSNqnVRHsXocLGmBNHjAvrlr0eDY9K2uCjWk,5069
@@ -72,11 +72,11 @@ 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=7fc4f9DDqtqG6wNb5_Q0km-fq0mqvGnbpR21qO1TJUw,960
-camomilla/templatetags/model_extras.py,sha256=mfPab5wQwAiBud4PWyn4lRumdqdniz3OhZy433zm4KQ,2180
-camomilla/theme/__init__.py,sha256=-G_a31a_XYZrR-sYH8Ect9skMQcf0vEfDEKXexJXOIw,30
+camomilla/templatetags/model_extras.py,sha256=6WfVDYP_OfuVJd3cNGNA55Wj9uWdrbfOZQ0ua9Xt_vc,2257
+camomilla/theme/__init__.py,sha256=unmO3xtN2S1e9meUbIjG3AZVyKxUe4HSZNXDOcpZRJg,22
 camomilla/theme/apps.py,sha256=Ue2H80fbFgxkQyHeU2H0fWs9Y6d-EnHYv4zz824FSRk,1066
 camomilla/theme/admin/__init__.py,sha256=TALAZaE-gWshSeGc6yy7VahdX5UfeCeoOE9Q5kJCEpM,2270
-camomilla/theme/admin/pages.py,sha256=y3rL1nwZlytyD-YR_qqLiBAmjCAjkBY3v56V6JdhBvY,1908
+camomilla/theme/admin/pages.py,sha256=HHi8dxjqffjMQGIRpOVNgQZhtKSSx3pFIctbqoZ9J2I,2614
 camomilla/theme/admin/translations.py,sha256=iAjGM1A1aYrsz1FpeybROk6rn3Ddl_oUCwgU5oD8nSw,308
 camomilla/theme/static/admin/css/responsive.css,sha256=yGq6qXrr8xEVsXTnprIBgkX-sMGZrNf0Kkh-xDxf6yE,157
 camomilla/theme/static/admin/img/favicon.ico,sha256=qpKv_2MaGILvyihnD1Vq9Yk-ZXGkxWTW26ciMeBFMYU,15406
@@ -89,7 +89,7 @@ camomilla/utils/normalization.py,sha256=RDCZtjwpEEwjvfUjQl2bEWFKw7NxTzkXco72VeO2
 camomilla/utils/query_parser.py,sha256=TUScPzPVVJzaKdqy5NqtMOft3H5Bx6liXTVPM1yjH24,6303
 camomilla/utils/seo.py,sha256=8p_a_TGgohenpJb094tT4mMxbn2xzW0qDILuTnjNocM,3324
 camomilla/utils/setters.py,sha256=LV57SM65rL1_ZQkVzk9al_Q13lndVywXLkqgfIvgS0Y,915
-camomilla/utils/templates.py,sha256=pgj9vrMypdJEYfvabbWRTu3r498pbjvcLCOSrrsm-sw,924
+camomilla/utils/templates.py,sha256=NAvvuv-fwu9CIxQY5t0RKs4GiFClOBZa9pOtcH_YP6s,1576
 camomilla/utils/translation.py,sha256=w5tvTInDLegWBb1TnDWo09ckKY3K6hajuNNsngZIxPQ,4205
 camomilla/views/__init__.py,sha256=94QuOnnbfMMb17mruO2ydUt286-8zBmDxEPWrJv5Wog,178
 camomilla/views/articles.py,sha256=qGxebOA5iTbGGe9PfbH40YBoDPKktH8FJongg6rh2R8,571
@@ -101,33 +101,34 @@ camomilla/views/menus.py,sha256=Kpygnf3tMKJ30gcblUES2NW83A37Vy75ecSGSvExGKM,3301
 camomilla/views/pages.py,sha256=UL74_u-18QdAkjVl74AVWZbRarEdIPrANTzdcM4iqmE,1338
 camomilla/views/tags.py,sha256=XcYRlcBFSPPY32lt7POb6fWPJL_8HsTo5JcHcAOiOKw,479
 camomilla/views/users.py,sha256=_fvsKOEtep4SJLvMva2_q-HdLQT_1KlFNt4wcl3xCJk,3130
-camomilla/views/base/__init__.py,sha256=t-7tqY_ep4Xi8YgB1sXDgNWQ5oh2YEUlfQWU5pltwJ0,1063
+camomilla/views/base/__init__.py,sha256=bpbVBGXLTy7No95XyDNB2U8hVXmwQJrF1VjLAS5WH90,1232
 camomilla/views/mixins/__init__.py,sha256=Znv3fLYVy6lgu03Q_D8fTen4zMxI6VSRaLPDU8Cp7Ws,473
 camomilla/views/mixins/bulk_actions.py,sha256=i0duWW6wey9m7I_V8-gPcHsbJyPEfSdMdj4h2i-CbPw,787
 camomilla/views/mixins/language.py,sha256=hfnYznlVMrMLBdJ_f8dChJWENg7Kpt9m1yqavrdLm7E,1299
 camomilla/views/mixins/optimize.py,sha256=iRPNkoeIIlJugk7DjJhDPaqeX7Opi7TxnUoMDnxJxUk,686
 camomilla/views/mixins/ordering.py,sha256=mh7fqPyVCVJh84Nl2pYFQouzGxa-ANF3Wqv0pCb7OVU,4779
-camomilla/views/mixins/pagination.py,sha256=NWerBdMyBt4Kswig4fbANqGTzsll8SJdE6a8_UIoueU,5772
+camomilla/views/mixins/pagination.py,sha256=Ssa5mMgAgyl7sUk0yum2uVifg6esdGmUTqMSJYacE40,5772
 camomilla/views/mixins/permissions.py,sha256=TPmR3Hoa3BjeJu9rCE_7lpLOAupue4WI42C21HTo6X4,200
-django_camomilla_cms-6.0.0b18.dist-info/licenses/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
+django_camomilla_cms-6.0.1.dist-info/licenses/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/test_admin_page_form.py,sha256=DRJxekEKeYMCf9q62ax7iBeJGhEP2NZ8o02krZBR_DA,1971
 tests/test_api.py,sha256=t03EFDezGgm4UJl8RIVvnTUkAGTB6ptm0G2lHBQ7ljc,1833
-tests/test_camomilla_filters.py,sha256=5LlR3tctGu6qxVmOrY52AGh_ACvEzdAvkwH2v7medpo,1536
-tests/test_media.py,sha256=IG-cigWxDnsq54DRVaPO2O0lcsnutfKRsqPTTR8W1E8,4183
-tests/test_menu.py,sha256=HyEdDzTDsLtNzsTNGjjZ6SCrgTXRU3FkKviUOacnYRg,3582
-tests/test_model_api.py,sha256=Ne8YlXTH2cqP5gzOc8UKjJuh0t-NaKHh5Ol9krpVHQg,3768
-tests/test_model_api_permissions.py,sha256=7CSb4-yIOfycAL_vXvh1dE2whx7k0gNkWl9LO0yzy4I,1801
-tests/test_model_api_register.py,sha256=9pqf7fvtniw63ZD4P2JItfDC0brD55vIrqjZ4phm_qs,14016
+tests/test_camomilla_filters.py,sha256=rUK8iEyUNH28uTd8Ac13OikiH4Xi-V4wbtS-XjJoG24,1580
+tests/test_media.py,sha256=n5PQmpMvw-a2epmq_60R0X-vVOa4BeyKMZkguGJzKa0,5243
+tests/test_menu.py,sha256=hrTikgXNnry1bS-t5K7UGYreEJ3m-FU0r4pduumwTd4,3791
+tests/test_model_api.py,sha256=ml3OlLuBfcnr2EMjwQLvVDPT2adSQ7WS4IxxXKD1InU,4121
+tests/test_model_api_permissions.py,sha256=lUlcYAOasFFQjMFnqhGXlXriCH-f6xdYSCn1Gqf1eSU,1838
+tests/test_model_api_register.py,sha256=txKaVTGt-DGrmI-6xcUEluPd7ArNi80VvlqBVXdH8zk,13555
 tests/test_models.py,sha256=WJs8lxWZWn1l7X3a_QFVc8fF5LHTsI8bc3uhQe6-o-Q,684
-tests/test_pages.py,sha256=qIVdfmbtx7GKHyNWHhirR58gGr9zjfrrzXXkvYlLusc,11469
+tests/test_pages.py,sha256=aXKI0l12lc6jmY3uJXDNwznVNH7SEIiujANvSo_rhIo,11911
 tests/test_query_parser.py,sha256=R9l0L2QDEDcm2b6IFUhyf7wMXLzL9RySLkzKTWRtBkE,2097
-tests/test_templates_context.py,sha256=D72ufRqCGjInGGXHSNVhlJ1HcWG0zMqrAiTuiaU057k,4694
-tests/test_utils.py,sha256=o_FG7XOxLePOBfwBr4sk09gej0onWNw9t2-gSjGmgNg,3741
-tests/fixtures/__init__.py,sha256=NGj22kLV65v56IpOrOVqSkPhJePTXD4QjuuZhZSMwfQ,460
+tests/test_templates_context.py,sha256=zGdmbQMGNXB2V_15BaQDIgqFMnVjBAw969n1tu3m7HY,5626
+tests/test_utils.py,sha256=ow4csGfU5WzMgAT5zWjZIxZwW1-BqnMduDt8hOzf9cE,2166
+tests/fixtures/__init__.py,sha256=ixyA6ZsmYbiKEsjQGOGoG4KyJmwWrf-qeoQjQG3J66U,426
 tests/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/utils/api.py,sha256=TYcDXeILHtBwzwG0acwPFmiqMZnlF9VnLB0Ydhg55vA,865
 tests/utils/media.py,sha256=-cnrQzzVuhNSb5rT5xMUs5f3yYpBnS0fVGDcjgsb8lw,291
-django_camomilla_cms-6.0.0b18.dist-info/METADATA,sha256=BwxjdmoaRTe-4KYk6odNDH53VHDiyBtS5vRA2dHWjIY,2565
-django_camomilla_cms-6.0.0b18.dist-info/WHEEL,sha256=_z0Kb-VmhLeNt2nZ-PsoQBjD25rP0tBwgAyRYD7oTKI,109
-django_camomilla_cms-6.0.0b18.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
-django_camomilla_cms-6.0.0b18.dist-info/RECORD,,
+django_camomilla_cms-6.0.1.dist-info/METADATA,sha256=JrWJpDNYLZJEirL-izKANrA95xxLSL6go3mHCmeHIMA,5652
+django_camomilla_cms-6.0.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+django_camomilla_cms-6.0.1.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
+django_camomilla_cms-6.0.1.dist-info/RECORD,,

{django_camomilla_cms-6.0.0b18.dist-info → django_camomilla_cms-6.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

tests/fixtures/__init__.py

@@ -4,14 +4,11 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 
 
 def load_json_fixture(filename):
-    with open(os.path.join(os.path.dirname(__file__), 'json', filename), "r") as f:
+    with open(os.path.join(os.path.dirname(__file__), "json", filename), "r") as f:
         return json.load(f)
 
 
 def load_asset(filename):
-    with open(os.path.join(os.path.dirname(__file__), 'assets', filename), "rb") as f:
-        up_file = SimpleUploadedFile(
-            filename,
-            f.read()
-        )
+    with open(os.path.join(os.path.dirname(__file__), "assets", filename), "rb") as f:
+        up_file = SimpleUploadedFile(filename, f.read())
         return up_file

tests/test_admin_page_form.py

@@ -0,0 +1,63 @@
+import responses
+from django.test import TestCase
+from camomilla.models import Page
+from camomilla.utils.templates import get_templates
+from camomilla.theme.admin import PageAdmin
+from django.contrib.admin.sites import AdminSite
+from camomilla.settings import INTEGRATIONS_ASTRO_URL
+
+
+class MockRequest:
+    pass
+
+
+request = MockRequest()
+
+
+class MockRequestWithCookies:
+    def __init__(self):
+        self.COOKIES = {"sessionid": "mock_session_id", "csrftoken": "mock_csrf_token"}
+
+
+request_with_cookies = MockRequestWithCookies()
+
+
+class AdminPageFormTestCase(TestCase):
+    def setUp(self):
+        self.astro_api_url = INTEGRATIONS_ASTRO_URL + "/api/templates"
+
+    @responses.activate
+    def test_admin_page_form_astro_error(self):
+        responses.add(
+            responses.GET,
+            self.astro_api_url,
+            status=500,  # Simulating a server error
+        )
+
+        page_admin = PageAdmin(Page, AdminSite())
+        form = page_admin.get_form(request)()
+        self.assertEqual(len(list(form.fields)), 33)
+        self.assertTrue("template" in list(form.fields))
+        self.assertListEqual(
+            form.fields["template"].widget.choices,
+            [("", "---------")] + [(t, t) for t in get_templates(request)],
+        )
+
+    @responses.activate
+    def test_admin_page_form(self):
+        responses.add(
+            responses.GET,
+            self.astro_api_url,
+            json=["mock_template/1", "mock_template/2"],
+            status=200,
+        )
+
+        page_admin = PageAdmin(Page, AdminSite())
+        form = page_admin.get_form(request_with_cookies)()
+        self.assertEqual(len(list(form.fields)), 33)
+        self.assertTrue("template" in list(form.fields))
+        self.assertListEqual(
+            form.fields["template"].widget.choices,
+            [("", "---------")] + [(t, t) for t in get_templates(request_with_cookies)],
+        )
+        self.assertEqual(responses.calls[0].request.url, self.astro_api_url)

tests/test_camomilla_filters.py

@@ -17,7 +17,9 @@ class CamomillaFiltersTestCase(TestCase):
         pass
 
     def test_filter_content(self):
-        Page.objects.create(identifier="path", title="Path", permalink="/path", status="PUB")
+        Page.objects.create(
+            identifier="path", title="Path", permalink="/path", status="PUB"
+        )
         request_factory = RequestFactory()
         request = request_factory.get("/path")
         request.META["HTTP_HOST"] = "localhost"
@@ -33,9 +35,11 @@ class CamomillaFiltersTestCase(TestCase):
         self.assertEqual(content.content, "Hello World!")
 
     def test_filter_alternate_urls(self):
-        Page.objects.create(identifier="path", title="Path", permalink="/path", status="PUB")
+        Page.objects.create(
+            identifier="path", title="Path", permalink="/path", status="PUB"
+        )
         request = RequestFactory().get("/path")
         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, "en": "/path/"})