Skip to content
Extraits de code Groupes Projets
Valider e787f2dd rédigé par Arnaud Fabre's avatar Arnaud Fabre
Parcourir les fichiers

fixes api

parent f4edd89b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -44,6 +44,7 @@ class ProposalSerializer(serializers.ModelSerializer): ...@@ -44,6 +44,7 @@ class ProposalSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = models.Proposal model = models.Proposal
fields = ( fields = (
'id',
'title', 'title',
'description', 'description',
'reference', 'reference',
...@@ -63,11 +64,25 @@ class ProposalHyperLinkedSerializer(ProposalSerializer): ...@@ -63,11 +64,25 @@ class ProposalHyperLinkedSerializer(ProposalSerializer):
read_only = True, read_only = True,
view_name = 'dossier-detail', view_name = 'dossier-detail',
) )
dossier_title = serializers.CharField(
read_only = True,
source = 'dossier.title'
)
dossier_reference = serializers.CharField(
read_only = True,
source = 'dossier.reference'
)
class Meta(ProposalSerializer.Meta): class Meta(ProposalSerializer.Meta):
fields = ('dossier', 'url',) + ProposalSerializer.Meta.fields fields = ProposalSerializer.Meta.fields + (
'dossier',
'dossier_title',
'dossier_reference',
'url',
)
class ProposalDetailSerializer(ProposalSerializer): class ProposalDetailSerializer(ProposalSerializer):
''' '''
Proposal Serializer with votes detail (used in Dossier Detail) Proposal Serializer with votes detail (used in Dossier Detail)
...@@ -85,7 +100,10 @@ class ProposalDetailHyperLinkedSerializer(ProposalDetailSerializer, ProposalHype ...@@ -85,7 +100,10 @@ class ProposalDetailHyperLinkedSerializer(ProposalDetailSerializer, ProposalHype
Proposal Serializer combined Detail Serializer and Hyperlinked Serializer Proposal Serializer combined Detail Serializer and Hyperlinked Serializer
''' '''
class Meta(ProposalSerializer.Meta): class Meta(ProposalSerializer.Meta):
fields = ('dossier',) + ProposalSerializer.Meta.fields + ( fields = ProposalSerializer.Meta.fields + (
'dossier',
'dossier_title',
'dossier_reference',
'votes', 'votes',
) )
...@@ -97,6 +115,7 @@ class DossierSerializer(serializers.ModelSerializer): ...@@ -97,6 +115,7 @@ class DossierSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = models.Dossier model = models.Dossier
fields = ( fields = (
'id',
'title', 'title',
'reference', 'reference',
'text', 'text',
...@@ -104,15 +123,29 @@ class DossierSerializer(serializers.ModelSerializer): ...@@ -104,15 +123,29 @@ class DossierSerializer(serializers.ModelSerializer):
) )
class DossierHyperLinkedSerializer(DossierSerializer): class DossierListSerializer(DossierSerializer):
''' '''
Dossier Serializer with hyperlinks to proposals Dossier Serializer with short description of proposals
'''
class ProposalSerializer(ProposalSerializer):
class Meta(ProposalSerializer.Meta):
fields = (
'id',
'url',
) + ProposalSerializer.Meta.fields
''' '''
proposals = serializers.HyperlinkedRelatedField( proposals = serializers.HyperlinkedRelatedField(
many=True, many=True,
read_only=True, read_only=True,
view_name='proposal-detail', view_name='proposal-detail',
) )
'''
proposals = ProposalSerializer(
many = True,
read_only = True
)
class Meta(DossierSerializer.Meta): class Meta(DossierSerializer.Meta):
fields = DossierSerializer.Meta.fields + ( fields = DossierSerializer.Meta.fields + (
...@@ -125,8 +158,9 @@ class DossierDetailSerializer(DossierSerializer): ...@@ -125,8 +158,9 @@ class DossierDetailSerializer(DossierSerializer):
''' '''
Dossier Serializer with proposals details Dossier Serializer with proposals details
''' '''
proposals = ProposalDetailSerializer( proposals = ProposalDetailSerializer(
many=True, many = True,
) )
class Meta(DossierSerializer.Meta): class Meta(DossierSerializer.Meta):
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter