django-pfx 1.4.dev126__tar.gz → 1.4.dev128__tar.gz

{django_pfx-1.4.dev126 → django_pfx-1.4.dev128}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev126
+Version: 1.4.dev128
 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

{django_pfx-1.4.dev126 → django_pfx-1.4.dev128}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev126
+Version: 1.4.dev128
 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

{django_pfx-1.4.dev126 → django_pfx-1.4.dev128}/pfx/pfxcore/views/fields.py

@@ -181,15 +181,7 @@ class ViewField:
         if hasattr(prop, 'fget'):
             field = getattr(prop.fget, 'field', None)
             if field:
-                setifnone(
-                    kwargs, 'verbose_name',
-                    cls._get_model_verbose_name(field))
-                setifnone(
-                    kwargs, 'field_type',
-                    FieldType.from_model_field(field.__class__))
-                kwargs['readonly'] = True
-                return ViewModelField(
-                    name, model_field=field, **kwargs)
+                return cls.from_model_field(name, field, **kwargs)
             verbose_name = getattr(
                 prop.fget, 'short_description', prop.fget.__name__)
             field_type = getattr(prop.fget, 'field_type', None)
@@ -213,14 +205,17 @@ class ViewField:
     @classmethod
     def from_name(cls, model, name, **kwargs):
         attr_model, attr_name = cls._resolve_lookup(model, name)
+        field = kwargs.pop('field', None)
         try:
             attr = getattr(attr_model, attr_name)
         except AttributeError:
+            if field:
+                return cls.from_model_field(name, field, **kwargs)
             kwargs['readonly'] = True
             return ViewField(name, **kwargs)
         if isinstance(attr, (property, cached_property)):
             return cls.from_property(name, attr, **kwargs)
-        field = attr_model._meta.get_field(attr_name)
+        field = field or attr_model._meta.get_field(attr_name)
         if LOOKUP_SEP in name:
             kwargs['readonly'] = True
         return cls.from_model_field(name, field, **kwargs)
@@ -406,7 +401,8 @@ class VF:
             self, name, verbose_name=None, field_type=None, alias=None,
             readonly=False, readonly_create=False, readonly_update=False,
             choices=None, select_related=None, prefetch_related=None,
-            json_repr=None, related_model=None, related_model_api=None):
+            json_repr=None, related_model=None, related_model_api=None,
+            field=None):
         self.kwargs = dict(
             name=name, verbose_name=verbose_name, field_type=field_type,
             alias=alias,
@@ -414,7 +410,7 @@ class VF:
             readonly_update=readonly_update, choices=choices,
             select_related=select_related, prefetch_related=prefetch_related,
             json_repr=json_repr, related_model=related_model,
-            related_model_api=related_model_api)
+            related_model_api=related_model_api, field=field)
 
     def to_field(self, model):
         return ViewField.from_name(model, **self.kwargs)