dynamicforms 0.76.16__tar.gz → 0.76.18__tar.gz

{dynamicforms-0.76.16 → dynamicforms-0.76.18}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.3
 Name: dynamicforms
-Version: 0.76.16
+Version: 0.76.18
 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
 Project-URL: Bug Tracker, https://github.com/velis74/DynamicForms/issues
 Author-email: Jure Erznožnik <jure@velis.si>
-License-Expression: MIT
-License-File: LICENSE
+License: MIT
 Classifier: Development Status :: 3 - Alpha
 Classifier: Framework :: Django
 Classifier: License :: OSI Approved :: BSD License

{dynamicforms-0.76.16 → dynamicforms-0.76.18}/dynamicforms/__init__.py

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

{dynamicforms-0.76.16 → dynamicforms-0.76.18}/dynamicforms/filters.py

@@ -29,9 +29,10 @@ class FilterBackend(filters.DjangoFilterBackend):
                 return ListWithFields(list(self.param_map.keys()), [self.get_ordering_value(param) for param in value])
 
         class FilterSetApplied(filters.FilterSet):
-            locals()[view.ordering_parameter] = MyOrderingFilter(
-                fields=[f.name for f in queryset.model._meta.fields if f.name not in ordering_excluded_fields]
-            )
+            if getattr(view, "ordering_parameter", None):  # SingleRecordViewSet tega nima
+                locals()[view.ordering_parameter] = MyOrderingFilter(
+                    fields=[f.name for f in queryset.model._meta.fields if f.name not in ordering_excluded_fields]
+                )
 
         return FilterSetApplied
 

{dynamicforms-0.76.16 → dynamicforms-0.76.18}/dynamicforms/pagination.py

@@ -18,7 +18,7 @@ class CursorPagination(drf_p.CursorPagination):
 
         self.base_url = request.build_absolute_uri()
         self.ordering = self.get_ordering(request, queryset, view)
-        if "id" not in self.ordering and "-id" not in self.ordering:
+        if not any(field in self.ordering for field in ('id', '-id', 'pk', '-pk')):
             ordering = list(self.ordering)
             ordering.append("id")
             self.ordering = tuple(ordering)
@@ -38,10 +38,10 @@ class CursorPagination(drf_p.CursorPagination):
         ordering = drf_p._reverse_ordering(self.ordering) if reverse else self.ordering
         # Currently we force nulls_first in ascending order and nulls_last in descending order
         ordering = [
-            getattr(F(field.lstrip("-")), "desc" if field.startswith("-") else "asc")(
-                **{"nulls_last" if field.startswith("-") else "nulls_first": True}
+            getattr(F(fld.lstrip("-+")), "desc" if fld.startswith("-") else "asc")(
+                **{"nulls_last" if fld.startswith(("-", "++")) and not fld.startswith("--") else "nulls_first": True}
             )
-            for field in ordering
+            for fld in ordering
         ]
         queryset = queryset.order_by(*ordering)
 
@@ -139,6 +139,7 @@ class CursorPagination(drf_p.CursorPagination):
 
         return self.page
 
+
     def _get_position_from_instance(self, instance, ordering):
         def process_field(idx):
             field_name = ordering[idx].lstrip("-")
@@ -153,6 +154,7 @@ class CursorPagination(drf_p.CursorPagination):
 
         return json.dumps({k: v for k, v in map(lambda idx: process_field(idx), range(len(ordering)))})
 
+
     def field_to_representation(self, value):
         """
         Converts field value to something that will be later understood by QuerySet.filter()
@@ -164,6 +166,7 @@ class CursorPagination(drf_p.CursorPagination):
             return self.NONE_VALUE
         return str(value)
 
+
     def field_to_python(self, queryset, order_attr, value):
         if order_attr in queryset.query.annotations:
             field = queryset.query.annotations.get(order_attr).field

{dynamicforms-0.76.16 → dynamicforms-0.76.18}/manage.py

@@ -23,7 +23,7 @@ if __name__ == "__main__":  # pragma: no cover
         raise
 
     params = list(sys.argv)
-    if params[1] == "makemessages":
+    if len(params) >= 2 and params[1] == "makemessages":
         params.extend(("-i", "node_modules", "-i", "static", "-i", "coverage", "-i", "dynamicforms_legacy"))
         params.extend(("-i", "tests", "-i", "setup", "-i", "examples", "-i", "dynamicforms_dev"))
         print("Modified makemessages: will process both django and djangojs domains")

{dynamicforms-0.76.16 → dynamicforms-0.76.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dynamicforms"
-version = "0.76.16"
+version = "0.76.18"
 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"