django-pfx 1.3.dev12__tar.gz → 1.3.dev16__tar.gz

{django-pfx-1.3.dev12 → django-pfx-1.3.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-pfx
-Version: 1.3.dev12
+Version: 1.3.dev16
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com
@@ -27,7 +27,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: django<5.0,>=4.2
 Requires-Dist: django-cors-headers
-Requires-Dist: django_json_widget
 Requires-Dist: pyjwt>=2.1
 Requires-Dist: Babel
 Requires-Dist: boto3

{django-pfx-1.3.dev12 → django-pfx-1.3.dev16}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-pfx
-Version: 1.3.dev12
+Version: 1.3.dev16
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com
@@ -27,7 +27,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: django<5.0,>=4.2
 Requires-Dist: django-cors-headers
-Requires-Dist: django_json_widget
 Requires-Dist: pyjwt>=2.1
 Requires-Dist: Babel
 Requires-Dist: boto3

{django-pfx-1.3.dev12 → django-pfx-1.3.dev16}/django_pfx.egg-info/requires.txt

@@ -1,6 +1,5 @@
 django<5.0,>=4.2
 django-cors-headers
-django_json_widget
 pyjwt>=2.1
 Babel
 boto3

{django-pfx-1.3.dev12 → django-pfx-1.3.dev16}/pfx/pfxcore/views/filters_views.py

@@ -32,7 +32,8 @@ class Filter():
     def __init__(
             self, name, label, type=None, filter_func=None,
             filter_func_and=False, filter_func_list=False, choices=None,
-            related_model=None, technical=False, defaults=None, ):
+            related_model=None, technical=False, defaults=None,
+            empty_value=True):
         self.name = name
         self.label = label
         self.type = type
@@ -43,13 +44,16 @@ class Filter():
         self.related_model = related_model
         self.technical = technical
         self.defaults = defaults or []
+        self.empty_value = empty_value
 
     @property
     def meta(self):
         res = dict(
+            is_group=False,
             label=_(self.label),
             name=self.name,
             type=self.type,
+            empty_value=self.empty_value,
             technical=self.technical)
         if self.choices:
             res['choices'] = [
@@ -89,9 +93,12 @@ class ModelFilter(Filter):
     def __init__(
             self, model, name, label=None, type=None,
             filter_func=None, filter_func_and=False, filter_func_list=False,
-            choices=None, related_model=None, technical=False, defaults=None):
+            choices=None, related_model=None, technical=False, defaults=None,
+            empty_value=None):
         self.model = model
         self.field = model._meta.get_field(name)
+        if empty_value is None:
+            empty_value = self.field.blank
         super().__init__(
             name, label or self.field.verbose_name,
             type or self._type_from_model,
@@ -100,7 +107,7 @@ class ModelFilter(Filter):
             related_model or (
                 self.field.remote_field and
                 self.field.remote_field.model),
-            technical=technical, defaults=defaults)
+            technical=technical, defaults=defaults, empty_value=empty_value)
 
     @property
     def _type_from_model(self):
@@ -112,18 +119,6 @@ class ModelFilter(Filter):
             return FieldType.ModelObject
         return model_type
 
-    @property
-    def meta(self):
-        res = dict(
-            is_group=False, label=_(self.label), name=self.name,
-            type=self.type, technical=self.technical)
-        if self.choices:
-            res['choices'] = [
-                dict(label=_(v), value=k) for k, v in self.choices]
-        if self.related_model:
-            res['related_model'] = str(self.related_model.__name__)
-        return res
-
     def query(self, params):
         values = self._get_values(params)
         if self.filter_func and values:

{django-pfx-1.3.dev12 → django-pfx-1.3.dev16}/pfx/pfxcore/views/rest_views.py

@@ -831,6 +831,7 @@ class ListRestViewMixin(ModelResponseMixin):
                     choices=dict(
                         type='array', items=dict(type='string'),
                         example=["value1", "value2"]),
+                    empty_value=dict(type='boolean'),
                     technical=dict(type='boolean'),
                     related_model=dict(type='string'))),
                 description="List of fields."),

{django-pfx-1.3.dev12 → django-pfx-1.3.dev16}/setup.cfg

@@ -33,7 +33,6 @@ include_package_data = true
 install_requires = 
 	django>=4.2,<5.0
 	django-cors-headers
-	django_json_widget
 	pyjwt>=2.1
 	Babel
 	boto3

{django-pfx-1.3.dev12 → django-pfx-1.3.dev16}/tests/tests/basic_api_test.py

@@ -203,6 +203,7 @@ class BasicAPITest(TestAssertMixin, TestCase):
         self.assertJE(response, 'filters.@0.name', 'book_type')
         self.assertJE(response, 'filters.@0.items', [
             {
+                'empty_value': False,
                 "is_group": False,
                 "label": "Science Fiction",
                 "name": "science_fiction",
@@ -210,12 +211,15 @@ class BasicAPITest(TestAssertMixin, TestCase):
                 "type": "BooleanField"
             },
             {
+                'empty_value': True,
+                "is_group": False,
                 "label": "Heroic Fantasy",
                 "name": "heroic_fantasy",
                 "technical": False,
                 "type": "BooleanField"
             },
             {
+                'empty_value': False,
                 "is_group": False,
                 "label": "Types",
                 "name": "types",
@@ -227,6 +231,7 @@ class BasicAPITest(TestAssertMixin, TestCase):
         self.assertJE(response, 'filters.@1.name', 'custom')
         self.assertJE(response, 'filters.@1.items', [
             {
+                'empty_value': False,
                 "is_group": False,
                 "label": "Last Name",
                 "name": "last_name",
@@ -234,6 +239,7 @@ class BasicAPITest(TestAssertMixin, TestCase):
                 "type": "BooleanField"
             },
             {
+                'empty_value': False,
                 "is_group": False,
                 "label": "First Name",
                 "name": "first_name",
@@ -251,6 +257,7 @@ class BasicAPITest(TestAssertMixin, TestCase):
                         "value": "female"
                     }
                 ],
+                'empty_value': False,
                 "is_group": False,
                 "label": "Gender",
                 "name": "gender",
@@ -268,6 +275,8 @@ class BasicAPITest(TestAssertMixin, TestCase):
                         "value": "Asimov"
                     }
                 ],
+                'empty_value': False,
+                "is_group": False,
                 "label": "Tolkien or Asimov",
                 "name": "last_name_choices",
                 "technical": False,

{django-pfx-1.3.dev12 → django-pfx-1.3.dev16}/tests/views.py

@@ -75,7 +75,8 @@ class AuthorRestView(AuthorRestViewMixin, SlugDetailRestViewMixin, RestView):
             Filter(
                 'last_name_choices', _("Tolkien or Asimov"),
                 FieldType.CharField, last_name_choices_filter,
-                choices=[('Tolkien', "Tolkien"), ('Asimov', "Asimov")]),
+                choices=[('Tolkien', "Tolkien"), ('Asimov', "Asimov")],
+                empty_value=False),
         ]),
     ]