django-camomilla-cms 6.0.0b18__tar.gz → 6.1.0__tar.gz

django_camomilla_cms-6.1.0/PKG-INFO

@@ -0,0 +1,133 @@
+Metadata-Version: 2.4
+Name: django-camomilla-cms
+Version: 6.1.0
+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.1.0/README.md

@@ -0,0 +1,102 @@
+[![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 → django_camomilla_cms-6.1.0}/camomilla/__init__.py

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

{django_camomilla_cms-6.0.0b18 → django_camomilla_cms-6.1.0}/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,17 +23,13 @@ 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
 from camomilla.templates_context.rendering import ctx_registry
 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()]
+from django.utils.module_loading import import_string
 
 
 class UrlRedirect(models.Model):
@@ -233,7 +228,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 +271,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)
@@ -294,6 +288,22 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
                 context.update(new_ctx)
         return ctx_registry.get_context_for_page(self, request, super_ctx=context)
 
+    @classmethod
+    def get_serializer(cls):
+        from camomilla.serializers.mixins import AbstractPageMixin
+
+        standard_serializer = (
+            pointed_getter(cls, "_page_meta.standard_serializer")
+            or settings.PAGES_DEFAULT_SERIALIZER
+        )
+        if isinstance(standard_serializer, str):
+            standard_serializer = import_string(standard_serializer)
+        if not issubclass(standard_serializer, AbstractPageMixin):
+            raise ValueError(
+                f"Standard serializer {standard_serializer} must be a subclass of AbstractPageMixin"
+            )
+        return standard_serializer
+
     @property
     def model_name(self) -> str:
         return self._meta.app_label + "." + self._meta.model_name
@@ -363,7 +373,8 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
     def generate_permalink(self, safe: bool = True) -> str:
         permalink = f"/{slugify(self.title or '', allow_unicode=True)}"
         if self.parent:
-            permalink = f"/{self.parent.permalink}{permalink}"
+            parent_permalink = (self.parent.permalink or "").lstrip("/")
+            permalink = f"/{parent_permalink}{permalink}"
         set_nofallbacks(self, "permalink", permalink)
         qs = UrlNode.objects.exclude(pk=getattr(self.url_node or object, "pk", None))
         if safe and qs.filter(permalink=permalink).exists():
@@ -462,7 +473,7 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
         preview = request and getattr(request, "GET", {}).get("preview", False)
         permalinks = get_field_translations(self.url_node or object, "permalink", None)
         for lang in activate_languages():
-            if lang in permalinks:
+            if lang in permalinks and permalinks[lang]:
                 permalinks[lang] = (
                     UrlNode.reverse_url(permalinks[lang])
                     if preview or self.is_public
@@ -482,6 +493,7 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
         parent_page_field = "parent_page"
         default_template = settings.PAGE_DEFAULT_TEMPLATE
         inject_context_func = settings.PAGE_INJECT_CONTEXT_FUNC
+        standard_serializer = settings.PAGES_DEFAULT_SERIALIZER
 
 
 class Page(AbstractPage):

{django_camomilla_cms-6.0.0b18 → django_camomilla_cms-6.1.0}/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:

{django_camomilla_cms-6.0.0b18 → django_camomilla_cms-6.1.0}/camomilla/serializers/page.py

@@ -22,7 +22,7 @@ class PageSerializer(AbstractPageMixin, BaseModelSerializer):
         fields = "__all__"
 
 
-class BasicUrlNodeSerializer(BaseModelSerializer):
+class UrlNodeSerializer(BaseModelSerializer):
     is_public = serializers.SerializerMethodField()
     status = serializers.SerializerMethodField()
     indexable = serializers.SerializerMethodField()
@@ -41,17 +41,18 @@ class BasicUrlNodeSerializer(BaseModelSerializer):
         return instance.page.indexable
 
 
-class UrlNodeSerializer(BasicUrlNodeSerializer):
+class RouteSerializer(UrlNodeSerializer):
     alternates = serializers.SerializerMethodField()
 
     def get_alternates(self, instance: UrlNode):
         return instance.page.alternate_urls()
 
     def to_representation(self, instance: UrlNode):
+        standard_serializer = instance.page.get_serializer()
         model_serializer = build_standard_model_serializer(
             instance.page.__class__,
             depth=10,
-            bases=(AbstractPageMixin,) + get_standard_bases(),
+            bases=(standard_serializer,) + get_standard_bases(),
         )
         return {
             **super().to_representation(instance),

{django_camomilla_cms-6.0.0b18 → django_camomilla_cms-6.1.0}/camomilla/settings.py

@@ -49,6 +49,12 @@ PAGE_INJECT_CONTEXT_FUNC = pointed_getter(
     django_settings, "CAMOMILLA.RENDER.PAGE.INJECT_CONTEXT", None
 )
 
+PAGES_DEFAULT_SERIALIZER = pointed_getter(
+    django_settings,
+    "CAMOMILLA.API.PAGES.DEFAULT_SERIALIZER",
+    "camomilla.serializers.mixins.AbstractPageMixin",
+)
+
 ENABLE_TRANSLATIONS = (
     ENABLE_REGISTRATIONS and "modeltranslation" in django_settings.INSTALLED_APPS
 )
@@ -88,8 +94,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 +127,12 @@ DEBUG = pointed_getter(django_settings, "CAMOMILLA.DEBUG", django_settings.DEBUG
 #     "STRUCTURED_FIELD": {
 #         "CACHE_ENABLED": True
 #     }
-#     "API": {"NESTING_DEPTH": 10, "TRANSLATION_ACCESSOR": "translations"},
+#     "INTEGRATIONS": {
+#         "ASTRO": {
+#             "ENABLE": True,
+#             "URL": "http://localhost:4321"
+#         }
+#     }
+#     "API": {"NESTING_DEPTH": 10, "TRANSLATION_ACCESSOR": "translations", "PAGES": {"DEFAULT_SERIALIZER": "camomilla.serializers.page.RouteSerializer"}},
 #     "DEBUG": False
 # }

{django_camomilla_cms-6.0.0b18 → django_camomilla_cms-6.1.0}/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>")

django_camomilla_cms-6.1.0/camomilla/theme/__init__.py

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

{django_camomilla_cms-6.0.0b18 → django_camomilla_cms-6.1.0}/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"

{django_camomilla_cms-6.0.0b18 → django_camomilla_cms-6.1.0}/camomilla/urls.py

@@ -19,7 +19,7 @@ from camomilla.views import (
     UserViewSet,
     MenuViewSet,
 )
-from camomilla.views.pages import fetch_page
+from camomilla.views.pages import pages_router
 from camomilla.redirects import url_patterns as old_redirects
 
 router = routers.DefaultRouter()
@@ -37,8 +37,8 @@ router.register(r"menus", MenuViewSet, "camomilla-menus")
 urlpatterns = [
     *old_redirects,
     path("", include(router.urls)),
-    path("pages-router/", fetch_page),
-    path("pages-router/<path:permalink>", fetch_page),
+    path("pages-router/", pages_router),
+    path("pages-router/<path:permalink>", pages_router),
     path("token-auth/", CamomillaObtainAuthToken.as_view(), name="api_token"),
     path("auth/login/", CamomillaAuthLogin.as_view(), name="login"),
     path("auth/logout/", CamomillaAuthLogout.as_view(), name="logout"),

django_camomilla_cms-6.1.0/camomilla/utils/templates.py

@@ -0,0 +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,
+    INTEGRATIONS_ASTRO_ENABLE,
+    INTEGRATIONS_ASTRO_URL,
+)
+
+
+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
+                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
+                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"))
+
+    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

{django_camomilla_cms-6.0.0b18 → django_camomilla_cms-6.1.0}/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
 
 

{django_camomilla_cms-6.0.0b18 → django_camomilla_cms-6.1.0}/camomilla/views/menus.py

@@ -9,7 +9,7 @@ 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 BasicUrlNodeSerializer
+from camomilla.serializers.page import UrlNodeSerializer
 from camomilla.views.base import BaseModelViewset
 from camomilla.views.decorators import active_lang
 
@@ -66,7 +66,12 @@ class MenuViewSet(BaseModelViewset):
             raise Http404("No object matches the given query.")
         return Response(
             [
-                {"id": obj.pk, "name": str(obj), "url_node_id": obj.url_node.pk}
+                {
+                    "id": obj.pk,
+                    "name": str(obj),
+                    "url_node_id": obj.url_node.pk,
+                    "model": f"{content_type.app_label}.{content_type.model}",
+                }
                 for obj in content_type.model_class().objects.exclude(
                     url_node__isnull=True
                 )
@@ -78,4 +83,4 @@ class MenuViewSet(BaseModelViewset):
     def search_urlnode(self, request, *args, **kwargs):
         url_node = request.GET.get("q", "")
         qs = UrlNode.objects.filter(permalink__icontains=url_node).order_by("permalink")
-        return Response(BasicUrlNodeSerializer(qs, many=True).data)
+        return Response(UrlNodeSerializer(qs, many=True).data)

{django_camomilla_cms-6.0.0b18 → django_camomilla_cms-6.1.0}/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(