File tree Expand file tree Collapse file tree 2 files changed +13
-7
lines changed Expand file tree Collapse file tree 2 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -21,8 +21,8 @@ def construct_fields(options):
21
21
exclude_fields = options .exclude_fields
22
22
23
23
fields = OrderedDict ()
24
- for field in _model_fields :
25
- name = field . name
24
+ print ( _model_fields )
25
+ for name , field in _model_fields :
26
26
is_not_in_only = only_fields and name not in options .only_fields
27
27
is_already_created = name in options .fields
28
28
is_excluded = name in exclude_fields or is_already_created
Original file line number Diff line number Diff line change 1
1
import inspect
2
+ import operator
2
3
3
4
from django .db import models
4
5
from django .db .models .manager import Manager
@@ -30,11 +31,11 @@ def get_reverse_fields(model):
30
31
# Hack for making it compatible with Django 1.6
31
32
new_related = RelatedObject (related .parent_model , related .model , related .field )
32
33
new_related .name = name
33
- yield new_related
34
+ yield ( name , new_related )
34
35
elif isinstance (related , models .ManyToOneRel ):
35
- yield related
36
+ yield ( name , related )
36
37
elif isinstance (related , models .ManyToManyRel ) and not related .symmetrical :
37
- yield related
38
+ yield ( name , related )
38
39
39
40
40
41
def maybe_queryset (value ):
@@ -45,8 +46,13 @@ def maybe_queryset(value):
45
46
46
47
def get_model_fields (model ):
47
48
reverse_fields = get_reverse_fields (model )
48
- all_fields = sorted (list (model ._meta .fields ) +
49
- list (model ._meta .local_many_to_many ))
49
+ all_fields = [
50
+ (field .name , field )
51
+ for field
52
+ in sorted (list (model ._meta .fields ) +
53
+ list (model ._meta .local_many_to_many ))
54
+ ]
55
+
50
56
all_fields += list (reverse_fields )
51
57
52
58
return all_fields
You can’t perform that action at this time.
0 commit comments