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

camomilla/__init__.py

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

camomilla/models/menu.py

@@ -10,6 +10,7 @@ from pydantic import (
     Field,
     SerializationInfo,
     computed_field,
+    field_serializer,
     model_serializer,
 )
 from structured.pydantic.models import BaseModel
@@ -17,6 +18,7 @@ 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
 
 
 class LinkTypes(str, Enum):
@@ -31,6 +33,10 @@ class MenuNodeLink(BaseModel):
     page: AbstractPage = 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/theme/__init__.py

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

camomilla/views/mixins/optimize.py

@@ -1,8 +1,14 @@
+from django.utils.module_loading import import_string
+
+
 class OptimViewMixin:
     def get_serializer_class(self):
         if hasattr(self, "action_serializers"):
             if self.action in self.action_serializers:
-                return self.action_serializers[self.action]
+                serializer = self.action_serializers[self.action]
+                if isinstance(serializer, str):
+                    serializer = import_string(serializer)
+                return serializer
         return super().get_serializer_class()
 
     def get_serializer_context(self):

camomilla/views/mixins/pagination.py

@@ -4,6 +4,7 @@ from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.contrib.postgres.search import SearchVector, SearchQuery, TrigramSimilarity
 from camomilla.utils.query_parser import ConditionParser
 from django.conf import settings
+from django.utils.module_loading import import_string
 
 
 class TrigramSearchMixin:
@@ -106,7 +107,10 @@ class PaginateStackMixin:
         )
 
     def format_output(self, paginator, elements, SerializerClass=None):
-        SerializerClass = SerializerClass or self.get_serializer_class()
+        if isinstance(SerializerClass, str):
+            SerializerClass = import_string(SerializerClass)
+        else:
+            SerializerClass = SerializerClass or self.get_serializer_class()
         return {
             "items": SerializerClass(
                 elements, many=True, context=self.get_serializer_context()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-camomilla-cms
-Version: 6.1.1
+Version: 6.1.3
 Summary: Django powered cms
 Author-email: Lotrèk <dimmitutto@lotrek.it>
 License: MIT

{django_camomilla_cms-6.1.1.dist-info → django_camomilla_cms-6.1.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-camomilla/__init__.py,sha256=2uWlUsuuK2sHK3-Pyn8YBZqA67UaOv1gQQl3Kkqx0Eg,243
+camomilla/__init__.py,sha256=SpvFS-PEvkpeFSYUELoawf6e9AZe2a3CsKcqkywAab4,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=OsoYKxY-08M3LjXxsnR47IuEI-DPf2IS6mi2ZWWCm9Y,3780
+camomilla/models/menu.py,sha256=uG6Ok0jNKOIpbRKUBBxPa8xwlzc_NinSG2A72YPUgR4,3969
 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
@@ -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=TogwtvfScmmY5i06w1pmsYL28pcWyPETM_YMFRujQQY,22
+camomilla/theme/__init__.py,sha256=9ozJUhQ_-TfrfDY6pFN8zCMMPrMX2He6OjjSZFiueh0,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
@@ -105,11 +105,11 @@ camomilla/views/base/__init__.py,sha256=bpbVBGXLTy7No95XyDNB2U8hVXmwQJrF1VjLAS5W
 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/optimize.py,sha256=Y-jMYmScLeY7ZnDS1K9o8aXSgTGc5RrYUh66r5d9R5k,889
 camomilla/views/mixins/ordering.py,sha256=mh7fqPyVCVJh84Nl2pYFQouzGxa-ANF3Wqv0pCb7OVU,4779
-camomilla/views/mixins/pagination.py,sha256=Ssa5mMgAgyl7sUk0yum2uVifg6esdGmUTqMSJYacE40,5772
+camomilla/views/mixins/pagination.py,sha256=0haXRJNFrawCRSe4kNd4EWHsuhBAjdeqCklGJ3SD2gw,5950
 camomilla/views/mixins/permissions.py,sha256=TPmR3Hoa3BjeJu9rCE_7lpLOAupue4WI42C21HTo6X4,200
-django_camomilla_cms-6.1.1.dist-info/licenses/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
+django_camomilla_cms-6.1.3.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.1.dist-info/METADATA,sha256=euaGysT3yY1GYIMKgQHbVFjEYHZ3it2zD_GZDdvGwOA,5652
-django_camomilla_cms-6.1.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-django_camomilla_cms-6.1.1.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
-django_camomilla_cms-6.1.1.dist-info/RECORD,,
+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,,