Support for GenericRelation

conduit/api/base.py

@@ -6,7 +6,7 @@
 from django.db.models.fields import FieldDoesNotExist
 from django.db import models
 from django.conf.urls import url
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes import fields, generic
 
 from decimal import Decimal
 from dateutil import parser
@@ -872,6 +872,16 @@ def _to_basic_type(self, obj, field):
         if isinstance(field, models.ManyToManyField):
             return eval(field.value_to_string(obj))
 
+        if isinstance(field, models.related.RelatedObject):
+            for virtual_field in self.Meta.model._meta.virtual_fields:
+                if virtual_field.name == 'content_object':
+                    related_obj = getattr(obj, virtual_field.name)
+                    return field.field.value_to_string(related_obj)
+            return None
+
+        if isinstance(field, fields.GenericRelation):
+            return field.value_to_string(obj)
+
         logger.info('Could not find field type match for {0}'.format(field))
         return None