diff --git a/picampaign/campaign/serializers.py b/picampaign/campaign/serializers.py index ed82b3dc4a6df418c09d66c14dded0bea2cad5d1..f5921432a6f6cbd9aa6a7d1ba78b423bce0d4b44 100644 --- a/picampaign/campaign/serializers.py +++ b/picampaign/campaign/serializers.py @@ -1,5 +1,6 @@ from picampaign.campaign.models import (Campaign, CampaignContact, Argumentary) +from picampaign.organization.serializers import GroupSerializer from rest_framework import serializers @@ -22,7 +23,7 @@ class CampaignContactSerializer(serializers.HyperlinkedModelSerializer): first_name = serializers.Field(source='contact.first_name') last_name = serializers.Field(source='contact.last_name') phone = serializers.Field(source='contact.phone') - groups = serializers.Field(source='all_groups') + groups = GroupSerializer(many=True, source='contact.groups') contact_id = serializers.Field(source='contact.id') class Meta: diff --git a/picampaign/organization/serializers.py b/picampaign/organization/serializers.py index d93464418853795a8ab85e0778e9081eb86e8543..d556e83c60ca5c9e6217405147435b82c8e0fcc5 100644 --- a/picampaign/organization/serializers.py +++ b/picampaign/organization/serializers.py @@ -1,4 +1,4 @@ -from picampaign.organization.models import FeedbackCategory +from picampaign.organization.models import FeedbackCategory, Group from rest_framework import serializers @@ -7,3 +7,11 @@ class CategorySerializer(serializers.ModelSerializer): class Meta: model = FeedbackCategory fields = ('id', 'name') + + +class GroupSerializer(serializers.ModelSerializer): + type = serializers.Field(source='type.name') + + class Meta: + model = Group + fields = ('type', 'name', 'media')