mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Code Issues Releases Wiki Activity

Renamed field_configs to field_serializer_overrides

Browse Source
This commit is contained in:
Karl Hobley 2017-03-30 11:12:08 +01:00
parent 161d55565b
commit 84d6262ca5
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wagtail/api/v2/endpoints.py
View File

@ -127,24 +127,24 @@ class BaseAPIEndpoint(GenericViewSet):
return meta_fields
@classmethod
def get_field_configs(cls, model):
configs = {}
def get_field_serializer_overrides(cls, model):
serializers = {}
if hasattr(model, 'api_fields'):
configs.update({
serializers.update({
field.name: field.serializer
for field in model.api_fields
if isinstance(field, APIField) and field.serializer is not None
})
if hasattr(model, 'api_meta_fields'):
configs.update({
serializers.update({
field.name: field.serializer
for field in model.api_meta_fields
if isinstance(field, APIField) and field.serializer is not None
})
return configs
return serializers
@classmethod
def get_available_fields(cls, model, db_fields_only=False):
@ -284,8 +284,15 @@ class BaseAPIEndpoint(GenericViewSet):
# Reorder fields so it matches the order of all_fields
fields = [field for field in all_fields if field in fields]
field_configs = {field[0]: field[1] for field in cls.get_field_configs(model).items() if field[0] in fields}
return get_serializer_class(model, fields, meta_fields=meta_fields, field_configs=field_configs, child_serializer_classes=child_serializer_classes, base=cls.base_serializer_class)
field_serializer_overrides = {field[0]: field[1] for field in cls.get_field_serializer_overrides(model).items() if field[0] in fields}
return get_serializer_class(
model,
fields,
meta_fields=meta_fields,
field_serializer_overrides=field_serializer_overrides,
child_serializer_classes=child_serializer_classes,
base=cls.base_serializer_class
)
def get_serializer_class(self):
request = self.request

6
wagtail/api/v2/serializers.py
View File

@ -337,7 +337,7 @@ class PageSerializer(BaseSerializer):
return super(PageSerializer, self).build_relational_field(field_name, relation_info)
def get_serializer_class(model, field_names, meta_fields, field_configs=None, child_serializer_classes=None, base=BaseSerializer):
def get_serializer_class(model, field_names, meta_fields, field_serializer_overrides=None, child_serializer_classes=None, base=BaseSerializer):
model_ = model
class Meta:
@ -350,7 +350,7 @@ def get_serializer_class(model, field_names, meta_fields, field_configs=None, ch
'child_serializer_classes': child_serializer_classes or {},
}
if field_configs:
attrs.update(field_configs)
if field_serializer_overrides:
attrs.update(field_serializer_overrides)
return type(str(model_.__name__ + 'Serializer'), (base, ), attrs)