django-camomilla-cms 6.1.3__py2.py3-none-any.whl → 6.1.4__py2.py3-none-any.whl

camomilla/__init__.py

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

camomilla/models/menu.py

@@ -10,7 +10,6 @@ from pydantic import (
     Field,
     SerializationInfo,
     computed_field,
-    field_serializer,
     model_serializer,
 )
 from structured.pydantic.models import BaseModel
@@ -18,7 +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 structured.utils.serializer import minimal_serialization
+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):
@@ -30,13 +40,9 @@ 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
 
-    @field_serializer('page')
-    def serialize_value(self, v):
-        return minimal_serialization(v)
-
     @model_serializer(mode="wrap", when_used="json")
     def update_relational(self, handler: Callable, info: SerializationInfo):
         if self.link_type == LinkTypes.relational:

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.

camomilla/theme/__init__.py

@@ -1 +1 @@
-__version__ = "6.1.3"
+__version__ = "6.1.4"

{django_camomilla_cms-6.1.3.dist-info → django_camomilla_cms-6.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-camomilla-cms
-Version: 6.1.3
+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.3.dist-info → django_camomilla_cms-6.1.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-camomilla/__init__.py,sha256=SpvFS-PEvkpeFSYUELoawf6e9AZe2a3CsKcqkywAab4,243
+camomilla/__init__.py,sha256=_e972NJVuSoS9uhtizioaade6GDYyEUfJcitCrE429g,243
 camomilla/apps.py,sha256=eUwb9ynyiRAc5OXgt7ZsAdhsCOnPCpNdIFYMheNeN-o,532
 camomilla/authentication.py,sha256=jz6tQT4PPEu-_JLox1LZrOy7EiWBb9MWaObK63MJGus,855
 camomilla/context_processors.py,sha256=cGowjDZ-oDGYn1j2Pj5QDGCqnzXAOdOwp5dmzin_FTc,165
@@ -27,7 +27,7 @@ camomilla/models/__init__.py,sha256=y7Q34AGhQ1weJUKWb6XjiyUbwRnJeylOBGMErU0wqYg,
 camomilla/models/article.py,sha256=LgkZgRsubtDV6NwBz8E2bIgKD6H3I-1QLAxEan5TYYs,1139
 camomilla/models/content.py,sha256=mIgtifb_WMIt58we5u6qWZemHvuDN1zZaBeCyzHL78A,956
 camomilla/models/media.py,sha256=pD-qldiHDOOHgux4lsivQLBcOJJrRx3a4Bg8ODNx7r0,6852
-camomilla/models/menu.py,sha256=uG6Ok0jNKOIpbRKUBBxPa8xwlzc_NinSG2A72YPUgR4,3969
+camomilla/models/menu.py,sha256=SSIjnrGreDqN7sfh4LSu2Ek6d-DPv8Dt7fAOZoGIQN4,4268
 camomilla/models/page.py,sha256=ihxY4r_yKL_yE7DJM-U-BDuHzukMmXc2Bk8hTuVrwoA,20007
 camomilla/models/mixins/__init__.py,sha256=c2NixqvrIX4E9WGRqQbylXlqBWDXEqN9mzs_dpB0hFQ,1248
 camomilla/openapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -53,7 +53,7 @@ camomilla/serializers/mixins/language.py,sha256=VukEvPzTpKQfwB-z_RtoNIJ43N3OEgfj
 camomilla/serializers/mixins/nesting.py,sha256=gCEU2UE_Y8e4VRnvT0AExFgwTfJm_jnSqa6l2SwZ3Mg,1432
 camomilla/serializers/mixins/optimize.py,sha256=zAtbtk6kfGq9FnapqI8tVYOuMKd1IkHbAV6LffL61Z4,3845
 camomilla/serializers/mixins/ordering.py,sha256=rXQOz47_U4IsMT6IBhySghcmJWMZgpPWHovDcZQG88k,1172
-camomilla/serializers/mixins/page.py,sha256=Ida7dY9MQTv747_dpPGpo6u3iL5GX87z4zeVct-C36s,2132
+camomilla/serializers/mixins/page.py,sha256=-8f70L0yVJyR_06fOFlxKxKnwvJUkBJqW38-SjwYekI,2231
 camomilla/serializers/mixins/translation.py,sha256=Om2UT2EB4Xvp8SrIEvraY0kJXR9H54AsYBr9DKjsay8,4323
 camomilla/storages/__init__.py,sha256=ytGgX59Ar8vFfYz7eV8z-j5yO_5FqxdZM25iyLnJuSA,131
 camomilla/storages/default.py,sha256=GNzvV_JZpXMcfTkyXjw5CfK8EIBi3o-NXYBO0KAxD5M,351
@@ -73,7 +73,7 @@ camomilla/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 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=6WfVDYP_OfuVJd3cNGNA55Wj9uWdrbfOZQ0ua9Xt_vc,2257
-camomilla/theme/__init__.py,sha256=9ozJUhQ_-TfrfDY6pFN8zCMMPrMX2He6OjjSZFiueh0,22
+camomilla/theme/__init__.py,sha256=EYwTVFPyFoL0qRFRa0edvPWfX2ajYnM9APdhVxj3rU4,22
 camomilla/theme/apps.py,sha256=Ue2H80fbFgxkQyHeU2H0fWs9Y6d-EnHYv4zz824FSRk,1066
 camomilla/theme/admin/__init__.py,sha256=TALAZaE-gWshSeGc6yy7VahdX5UfeCeoOE9Q5kJCEpM,2270
 camomilla/theme/admin/pages.py,sha256=HHi8dxjqffjMQGIRpOVNgQZhtKSSx3pFIctbqoZ9J2I,2614
@@ -109,7 +109,7 @@ camomilla/views/mixins/optimize.py,sha256=Y-jMYmScLeY7ZnDS1K9o8aXSgTGc5RrYUh66r5
 camomilla/views/mixins/ordering.py,sha256=mh7fqPyVCVJh84Nl2pYFQouzGxa-ANF3Wqv0pCb7OVU,4779
 camomilla/views/mixins/pagination.py,sha256=0haXRJNFrawCRSe4kNd4EWHsuhBAjdeqCklGJ3SD2gw,5950
 camomilla/views/mixins/permissions.py,sha256=TPmR3Hoa3BjeJu9rCE_7lpLOAupue4WI42C21HTo6X4,200
-django_camomilla_cms-6.1.3.dist-info/licenses/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
+django_camomilla_cms-6.1.4.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
@@ -130,7 +130,7 @@ tests/fixtures/__init__.py,sha256=ixyA6ZsmYbiKEsjQGOGoG4KyJmwWrf-qeoQjQG3J66U,42
 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.1.3.dist-info/METADATA,sha256=8gLpYIp0zn6Zhyi9k1rvMGTRiRjebE1u8xjDXAkhSI4,5652
-django_camomilla_cms-6.1.3.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-django_camomilla_cms-6.1.3.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
-django_camomilla_cms-6.1.3.dist-info/RECORD,,
+django_camomilla_cms-6.1.4.dist-info/METADATA,sha256=x30vUkA5zxm0eY9plcflZzK8e3LqBx7odwLC59UOMI4,5652
+django_camomilla_cms-6.1.4.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+django_camomilla_cms-6.1.4.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
+django_camomilla_cms-6.1.4.dist-info/RECORD,,