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

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

@@ -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 → django_camomilla_cms-6.1.2}/camomilla/__init__.py

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

{django_camomilla_cms-6.1.0 → django_camomilla_cms-6.1.2}/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)

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

django_camomilla_cms-6.1.2/camomilla/theme/__init__.py

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

{django_camomilla_cms-6.1.0 → django_camomilla_cms-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):

{django_camomilla_cms-6.1.0 → django_camomilla_cms-6.1.2}/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 → django_camomilla_cms-6.1.2/django_camomilla_cms.egg-info}/PKG-INFO

@@ -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 → django_camomilla_cms-6.1.2}/setup.py

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

django_camomilla_cms-6.1.0/camomilla/theme/__init__.py

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