Corrected region serializers

This commit is contained in:
Jeremy Stretch 2017-02-28 16:21:31 -05:00
parent c0152940f9
commit 90fe556e5f
2 changed files with 7 additions and 6 deletions

View File

@ -30,7 +30,7 @@ class RegionSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Region model = Region
fields = ['id', 'url', 'name', 'slug', 'parent'] fields = ['id', 'name', 'slug', 'parent']
class WritableRegionSerializer(serializers.ModelSerializer): class WritableRegionSerializer(serializers.ModelSerializer):
@ -51,9 +51,9 @@ class SiteSerializer(CustomFieldModelSerializer):
class Meta: class Meta:
model = Site model = Site
fields = [ fields = [
'id', 'name', 'slug', 'tenant', 'facility', 'asn', 'physical_address', 'shipping_address', 'contact_name', 'id', 'name', 'slug', 'region', 'tenant', 'facility', 'asn', 'physical_address', 'shipping_address',
'contact_phone', 'contact_email', 'comments', 'custom_fields', 'count_prefixes', 'count_vlans', 'contact_name', 'contact_phone', 'contact_email', 'comments', 'custom_fields', 'count_prefixes',
'count_racks', 'count_devices', 'count_circuits', 'count_vlans', 'count_racks', 'count_devices', 'count_circuits',
] ]

View File

@ -29,7 +29,7 @@ from . import serializers
# Regions # Regions
# #
class RegionViewSet(WritableSerializerMixin, CustomFieldModelViewSet): class RegionViewSet(WritableSerializerMixin, ModelViewSet):
queryset = Region.objects.all() queryset = Region.objects.all()
serializer_class = serializers.RegionSerializer serializer_class = serializers.RegionSerializer
write_serializer_class = serializers.WritableRegionSerializer write_serializer_class = serializers.WritableRegionSerializer
@ -40,8 +40,9 @@ class RegionViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
# #
class SiteViewSet(WritableSerializerMixin, CustomFieldModelViewSet): class SiteViewSet(WritableSerializerMixin, CustomFieldModelViewSet):
queryset = Site.objects.select_related('tenant') queryset = Site.objects.select_related('region', 'tenant')
serializer_class = serializers.SiteSerializer serializer_class = serializers.SiteSerializer
filter_class = filters.SiteFilter
write_serializer_class = serializers.WritableSiteSerializer write_serializer_class = serializers.WritableSiteSerializer
@detail_route() @detail_route()