django-camomilla-cms 6.1.0__py2.py3-none-any.whl → 6.1.2__py2.py3-none-any.whl

camomilla/__init__.py

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

camomilla/models/menu.py

@@ -74,7 +74,7 @@ class MenuNode(BaseModel):
 
 
 class Menu(models.Model):
-    key = models.CharField(max_length=200, unique=True, editable=False)
+    key = models.CharField(max_length=200, unique=True, editable=True, default=uuid4)
     available_classes = models.JSONField(default=dict, editable=False)
     enabled = models.BooleanField(default=True)
     nodes = StructuredJSONField(default=list, schema=MenuNode)

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)
+        return getattr(self, PAGE_CHILD_RELATED_NAME % self.model_info, self.objects.none())
 
     @property
     def parent(self) -> models.Model:

camomilla/theme/__init__.py

@@ -1 +1 @@
-__version__ = "6.1.0"
+__version__ = "6.1.2"

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.0.dist-info → django_camomilla_cms-6.1.2.dist-info}/METADATA

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

{django_camomilla_cms-6.1.0.dist-info → django_camomilla_cms-6.1.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-camomilla/__init__.py,sha256=R1pWTtcXHHHh0t0eJesB_UA9sQWaAVY2b2JPbeBk_68,243
+camomilla/__init__.py,sha256=lKyI3sUjmiwMaYiRT9eNAQ1r1YJS3WfosCE2Xi0aq4M,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,8 +27,8 @@ 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=hUszPcn1prWCDhk4RPvbITmyhsB2CjFkaerx9t1GWnc,3766
-camomilla/models/page.py,sha256=hL2txxJv5MScU-BsphZUYCybllNAEiR3Dd25c_AS35Y,19976
+camomilla/models/menu.py,sha256=OsoYKxY-08M3LjXxsnR47IuEI-DPf2IS6mi2ZWWCm9Y,3780
+camomilla/models/page.py,sha256=uRX2Kbu62J6luSZYYPu7rR6IZ4nWV7_6xHx6otFDeP8,19997
 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
@@ -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=PD5agZ0_DXqsFLMBR0hacZV3LbzGbH8qn-j7MIAm3Xs,22
+camomilla/theme/__init__.py,sha256=YN8byPcjyQjphqvazTEzWioECzFuTCnjb_LQ7d7T_gw,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.0.dist-info/licenses/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
+django_camomilla_cms-6.1.2.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.0.dist-info/METADATA,sha256=mA_yBZVvW76HuYxBelBObDFK6c7kztUJ67Svwps6gFY,5652
-django_camomilla_cms-6.1.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-django_camomilla_cms-6.1.0.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
-django_camomilla_cms-6.1.0.dist-info/RECORD,,
+django_camomilla_cms-6.1.2.dist-info/METADATA,sha256=CPRn1GWY9A-AV0Js_ciDIanALSfx1ClooNDuB47U-Sw,5652
+django_camomilla_cms-6.1.2.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+django_camomilla_cms-6.1.2.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
+django_camomilla_cms-6.1.2.dist-info/RECORD,,