django-pfx 1.4.dev150__tar.gz → 1.4.dev152__tar.gz

{django_pfx-1.4.dev150 → django_pfx-1.4.dev152}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev150
+Version: 1.4.dev152
 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.dev150 → django_pfx-1.4.dev152}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-pfx
-Version: 1.4.dev150
+Version: 1.4.dev152
 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.dev150 → django_pfx-1.4.dev152}/pfx/pfxcore/decorator/rest.py

@@ -54,11 +54,12 @@ def rest_api(
     return decorator
 
 
-def rest_property(string=None, type="CharField", field=None):
+def rest_property(string=None, type="CharField", field=None, order=None):
     def decorator(func):
         func.short_description = string
         func.field_type = type
         func.field = field
+        func.order = order
         return property(func)
     return decorator
 

{django_pfx-1.4.dev150 → django_pfx-1.4.dev152}/pfx/pfxcore/views/fields.py

@@ -106,7 +106,7 @@ def get_db_type(field):
 class ViewField:
     def __init__(
             self, name, verbose_name=None, alias=None,
-            field_type=None, db_type=None,
+            field_type=None, db_type=None, order=None,
             readonly=False, readonly_create=False, readonly_update=False,
             choices=None, json_repr=None, media_field_api=None,
             related_model=None, related_model_api=None, related_fields=None,
@@ -118,6 +118,7 @@ class ViewField:
         self.verbose_name = verbose_name or name
         self.field_type = field_type
         self.db_type = db_type
+        self.order = order
         self.choices = dict(choices or [])
         self.json_repr = json_repr
         self.media_field_api = media_field_api
@@ -150,6 +151,7 @@ class ViewField:
         res['readonly'] = dict(
             post=self.readonly_create,
             put=self.readonly_update)
+        res['order'] = self.order
         return res
 
     def get_value(self, obj):
@@ -213,6 +215,7 @@ class ViewField:
     def from_property(cls, name, prop, **kwargs):
         kwargs['readonly'] = True
         if hasattr(prop, 'fget'):
+            setifnone(kwargs, 'order', getattr(prop.fget, 'order', None))
             field = getattr(prop.fget, 'field', None)
             if field:
                 return cls.from_model_field(name, field, **kwargs)
@@ -237,6 +240,8 @@ class ViewField:
             kwargs, 'field_type', FieldType.from_model_field(field.__class__))
         setifnone(
             kwargs, 'db_type', get_db_type(field))
+        if kwargs.get('order') == '__auto__':
+            kwargs['order'] = name
         return ViewModelField(
             name, model_field=field, **kwargs)
 
@@ -254,6 +259,7 @@ class ViewField:
         if isinstance(attr, (property, cached_property)):
             return cls.from_property(name, attr, **kwargs)
         field = field or attr_model._meta.get_field(attr_name)
+        kwargs['order'] = '__auto__'
         if LOOKUP_SEP in name:
             kwargs['readonly'] = True
         return cls.from_model_field(name, field, **kwargs)
@@ -446,7 +452,7 @@ class VF:
             choices=None, select_related=None, prefetch_related=None,
             json_repr=None, related_model=None, related_model_api=None,
             field=None, related_fields=None, media_field_api=None,
-            db_type=None):
+            db_type=None, order=None):
         self.kwargs = dict(
             name=name, verbose_name=verbose_name, field_type=field_type,
             alias=alias,
@@ -456,7 +462,7 @@ class VF:
             json_repr=json_repr, related_model=related_model,
             related_model_api=related_model_api, field=field,
             related_fields=related_fields, media_field_api=media_field_api,
-            db_type=db_type)
+            db_type=db_type, order=order)
 
     def to_field(self, model):
         return ViewField.from_name(model, **self.kwargs)