Merge branch 'patch-4' into 'master'

bugfix: trying to fix exclusion of circles from serializer

See merge request !11

djangoldp_polls/models.py

@@ -55,8 +55,9 @@ class Poll (Model):
 	circle = models.ForeignKey(Circle, null=True, related_name="polls")
 
 	class Meta : 
-		serializer_fields = ['@id','created_at','debate','pollOptions','votes','author','title','image','hostingOrganisation','startDate','endDate','shortDescription','longDescription','tags']
-		nested_fields = ['tags','votes','pollOptions','debate']
+		serializer_fields = ['@id','created_at','debate','pollOptions','votes','author','title','image','circle',\
+		                    'hostingOrganisation','startDate','endDate','shortDescription','longDescription','tags']
+		nested_fields = ['tags','votes','pollOptions','debate','circle']
 		anonymous_perms = ['view','add','change']
 		authenticated_perms = ['inherit','add']