Merge branch 'develop' into feature/establishment
This commit is contained in:
commit
dcab146ede
|
|
@ -32,7 +32,8 @@ class SiteFeatureSerializer(serializers.ModelSerializer):
|
||||||
class SiteSettingsSerializer(serializers.ModelSerializer):
|
class SiteSettingsSerializer(serializers.ModelSerializer):
|
||||||
"""Site settings serializer."""
|
"""Site settings serializer."""
|
||||||
|
|
||||||
published_features = SiteFeatureSerializer(many=True, allow_null=True)
|
published_features = SiteFeatureSerializer(source='published_sitefeatures',
|
||||||
|
many=True, allow_null=True)
|
||||||
#todo: remove this
|
#todo: remove this
|
||||||
country_code = serializers.CharField(source='subdomain', read_only=True)
|
country_code = serializers.CharField(source='subdomain', read_only=True)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user