Fix polymorphic type resolution in relations

django-json-api · mblayman · Jun 5, 2017 · Feb 21, 2016 · Mar 14, 2016 · May 13, 2016
commit ae759e5dda8ca5eb779d86b57a04a8faeb0d8b05
diff --git a/rest_framework_json_api/relations.py b/rest_framework_json_api/relations.py
@@ -169,7 +169,7 @@ def to_representation(self, value):
             pk = value.pk
 
         resource_type = self.get_resource_type_from_included_serializer()
-        if resource_type is None and self._skip_polymorphic_optimization:
+        if resource_type is None or not self._skip_polymorphic_optimization:
             resource_type = get_resource_type_from_instance(value)
 
         return OrderedDict([('type', resource_type), ('id', str(pk))])