Commit 84457c9

committed

Fixed case where a missing meta_field value would error

1 parent 3b93077 commit 84457c9Copy full SHA for 84457c9

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ def extract_meta(serializer, resource):`
`325`	`325`	`meta = getattr(serializer.child, 'Meta', None)`
`326`	`326`	`else:`
`327`	`327`	`meta = getattr(serializer, 'Meta', None)`
`328`		`- meta_fields = getattr(meta, 'meta_fields', {})`
	`328`	`+ meta_fields = getattr(meta, 'meta_fields', [])`
`329`	`329`	`data = OrderedDict()`
`330`	`330`	`for field_name in meta_fields:`
`331`	`331`	`data.update({`

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,10 +150,13 @@ def get_field_names(self, declared_fields, info):`
`150`	`150`	`"""`
`151`	`151`	`meta_fields = getattr(self.Meta, 'meta_fields', None)`
`152`	`152`
`153`		`- declared = OrderedDict()`
`154`		`- for field_name in declared_fields.keys():`
`155`		`- field = declared_fields[field_name]`
`156`		`- if field_name not in meta_fields:`
`157`		`- declared[field_name] = field`
	`153`	`+ if meta_fields:`
	`154`	`+ declared = OrderedDict()`
	`155`	`+ for field_name in set(declared_fields.keys()):`
	`156`	`+ field = declared_fields[field_name]`
	`157`	`+ if field_name not in meta_fields:`
	`158`	`+ declared[field_name] = field`
	`159`	`+ else:`
	`160`	`+ declared = declared_fields`
`158`	`161`	`return super(ModelSerializer, self).get_field_names(declared, info)`
`159`	`162`

Comments

(0)