dynamicforms 0.77.10__tar.gz → 0.77.12__tar.gz

{dynamicforms-0.77.10 → dynamicforms-0.77.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dynamicforms
-Version: 0.77.10
+Version: 0.77.12
 Summary: DynamicForms performs all the visualisation & data entry of your DRF Serializers & ViewSets and adds some candy of its own
 Project-URL: Homepage, https://github.com/velis74/DynamicForms
 Project-URL: Repository, https://github.com/velis74/DynamicForms

{dynamicforms-0.77.10 → dynamicforms-0.77.12}/dynamicforms/__init__.py

@@ -1,5 +1,5 @@
 __title__ = "DynamicForms"
-__version__ = '0.77.10'
+__version__ = '0.77.12'
 __author__ = "Jure Erznožnik"
 __email__ = "jure.erznoznik@gmail.com"
 __license__ = "BSD 3-Clause"

{dynamicforms-0.77.10 → dynamicforms-0.77.12}/dynamicforms/serializers.py

@@ -353,7 +353,7 @@ class ModelSerializer(DynamicFormsSerializer, serializers.ModelSerializer):
                 declared_fields[resolved_field_name] = fields.SerializerMethodField(
                     source="*",
                     display_form=DisplayMode.HIDDEN,
-                    display_table=DisplayMode.FULL,
+                    display_table=getattr(s_field, "display_table", DisplayMode.FULL),
                     render_params=getattr(s_field, "render_params", None) if s_field else None,
                 )
 

{dynamicforms-0.77.10 → dynamicforms-0.77.12}/dynamicforms/template_render/mixins/listserializer.py

@@ -55,8 +55,11 @@ class ViewModeListSerializer(ViewModeBase, FieldRenderMixin, ListSerializer):
     uuid = property(lambda self: self.child.uuid, lambda self, value: setattr(self.child, "uuid", value))
 
     @classmethod
-    def get_reverse_url(cls, view_name, request):
-        return reverse(view_name + "-list", format="json", request=request)
+    def get_reverse_url(cls, view_name, request, kwargs=None):
+        if kwargs:
+            kwargs = kwargs.copy()
+            kwargs.pop("pk", None)
+        return reverse(view_name + "-list", format="json", request=request, kwargs=kwargs)
 
     def apply_component_context(self, request=None, paginator=None):
         # Different to ViewModeSerializer.get_component_context - which is a class method creating the instances
@@ -67,7 +70,11 @@ class ViewModeListSerializer(ViewModeBase, FieldRenderMixin, ListSerializer):
 
         self.child.apply_component_context(request, paginator)
         self.view_mode = ViewModeListSerializer.ViewMode.TABLE
-        self.reverse_url = self.get_reverse_url(self.child.template_context["url_reverse"], request)
+        self.reverse_url = self.get_reverse_url(
+            self.child.template_context["url_reverse"],
+            request,
+            self.child.template_context.get("url_reverse_kwargs", self.child.default_url_reverse_kwargs),
+        )
         self.paginator = paginator
         if paginator:
             base_url = paginator.base_url.split("?", 1)

{dynamicforms-0.77.10 → dynamicforms-0.77.12}/dynamicforms/template_render/mixins/serializer.py

@@ -188,7 +188,7 @@ class ViewModeSerializer(ViewModeBase, SerializerFilter, metaclass=SerializerMet
     @property
     def layout(self):
         template_context = getattr(self, "template_context", {})
-        if hasattr(self, 'determine_layout_at_runtime') and (layout := self.determine_layout_at_runtime(self.request)):
+        if hasattr(self, "determine_layout_at_runtime") and (layout := self.determine_layout_at_runtime(self.request)):
             return layout
         elif hasattr(self, "Meta") and hasattr(self.Meta, "layout"):
             return self.Meta.layout
@@ -265,6 +265,13 @@ class ViewModeSerializer(ViewModeBase, SerializerFilter, metaclass=SerializerMet
         ser.paginator = paginator
         return ser
 
+    @property
+    def default_url_reverse_kwargs(self):
+        if not self.parent and "id" not in self.data:
+            return dict(pk=None)
+        else:
+            return dict(pk=self.data["id"] if not getattr(self, "parent", None) else "--record_id--")
+
     def apply_component_context(self, request=None, paginator=None):
         # Different to ViewModeSerializer.get_component_context - which is a class method creating the instances
         # this one will decorate existing instance with the appropriate values needed for rendering
@@ -280,13 +287,10 @@ class ViewModeSerializer(ViewModeBase, SerializerFilter, metaclass=SerializerMet
                 else ViewModeSerializer.ViewMode.FORM
             )
 
-        if not self.parent and "id" not in self.data:
-            def_kwargs = dict(pk=None)
-        else:
-            def_kwargs = dict(pk=self.data["id"] if not getattr(self, "parent", None) else "--record_id--")
-
         self.reverse_url = self.get_reverse_url(
-            self.template_context["url_reverse"], request, self.template_context.get("url_reverse_kwargs", def_kwargs)
+            self.template_context["url_reverse"],
+            request,
+            self.template_context.get("url_reverse_kwargs", self.default_url_reverse_kwargs),
         )
 
 

{dynamicforms-0.77.10 → dynamicforms-0.77.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dynamicforms"
-version = "0.77.10"
+version = "0.77.12"
 description = "DynamicForms performs all the visualisation & data entry of your DRF Serializers & ViewSets and adds some candy of its own"
 readme = "README.md"
 requires-python = ">=3.8"