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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-camomilla-cms
-Version: 6.1.2
+Version: 6.1.4
 Summary: Django powered cms
 Author-email: Lotrèk <dimmitutto@lotrek.it>
 License: MIT
@@ -11,13 +11,13 @@ Classifier: Framework :: Django
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Requires-Python: <=3.13,>=3.8
+Requires-Python: <=3.13,>=3.9
 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: django-structured-json-field>=1.1.1
 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.2 → django_camomilla_cms-6.1.4}/camomilla/__init__.py

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

{django_camomilla_cms-6.1.2 → django_camomilla_cms-6.1.4}/camomilla/models/menu.py

@@ -17,6 +17,18 @@ from structured.fields import StructuredJSONField
 from camomilla.models.page import UrlNode, AbstractPage
 from typing import Optional, Union, Callable, List
 from django.db.models.base import Model as DjangoModel
+from typing_extensions import Annotated
+from structured.pydantic.fields.serializer import FieldSerializer
+from rest_framework import serializers
+
+
+class AbstractPageMinimalSerializer(serializers.Serializer):
+    def to_representation(self, instance):
+        return {
+            "id": instance.id,
+            "name": instance.__str__(),
+            "model": f"{instance._meta.app_label}.{instance._meta.model_name}",
+        }
 
 
 class LinkTypes(str, Enum):
@@ -28,7 +40,7 @@ class MenuNodeLink(BaseModel):
     link_type: LinkTypes = LinkTypes.static
     static: str = None
     content_type: ContentType = None
-    page: AbstractPage = None
+    page: Annotated[AbstractPage, FieldSerializer(AbstractPageMinimalSerializer)] = None
     url_node: UrlNode = None
 
     @model_serializer(mode="wrap", when_used="json")

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

@@ -343,7 +343,7 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
     def childs(self) -> models.Manager:
         if hasattr(self._page_meta, "child_page_field"):
             return getattr(self, self._page_meta.child_page_field)
-        return getattr(self, PAGE_CHILD_RELATED_NAME % self.model_info, self.objects.none())
+        return getattr(self, PAGE_CHILD_RELATED_NAME % self.model_info, self.__class__.objects.none())
 
     @property
     def parent(self) -> models.Model:

{django_camomilla_cms-6.1.2 → django_camomilla_cms-6.1.4}/camomilla/serializers/mixins/page.py

@@ -2,12 +2,14 @@ from rest_framework import serializers
 from camomilla.models import UrlNode
 from camomilla.serializers.validators import UniquePermalinkValidator
 from typing import TYPE_CHECKING
+from structured.contrib.restframework import StructuredModelSerializer
+
 
 if TYPE_CHECKING:
     from camomilla.models.page import AbstractPage
 
 
-class AbstractPageMixin(serializers.ModelSerializer):
+class AbstractPageMixin(StructuredModelSerializer, serializers.ModelSerializer):
     """
     This mixin is needed to serialize AbstractPage models.
     It provides permalink validation and some extra fields serialization.

django_camomilla_cms-6.1.4/camomilla/theme/__init__.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-camomilla-cms
-Version: 6.1.2
+Version: 6.1.4
 Summary: Django powered cms
 Author-email: Lotrèk <dimmitutto@lotrek.it>
 License: MIT
@@ -11,13 +11,13 @@ Classifier: Framework :: Django
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Requires-Python: <=3.13,>=3.8
+Requires-Python: <=3.13,>=3.9
 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: django-structured-json-field>=1.1.1
 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.2 → django_camomilla_cms-6.1.4}/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>=0.4.2
+django-structured-json-field>=1.1.1
 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.2 → django_camomilla_cms-6.1.4}/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>=0.4.2",
+  "django-structured-json-field>=1.1.1",
   "Pillow>=10.0.0",
   "django-admin-interface>=0.26.0,<1.0.0",
   "django-ckeditor>=5.7.1,<7.0.0",
@@ -31,7 +31,7 @@ dynamic = ["version"]
 keywords = ["cms", "django", "api cms"]
 license = {text = "MIT"}
 name = "django-camomilla-cms"
-requires-python = ">= 3.8, <=3.13"
+requires-python = ">= 3.9, <=3.13"
 
 [project.readme]
 content-type = "text/markdown"

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

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

django_camomilla_cms-6.1.2/camomilla/theme/__init__.py

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