From 4160bbcf72947164b1757dd6a83f514d56422dd9 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy <xordoquy@linovia.com>
Date: Fri, 11 Apr 2014 23:13:43 +0200
Subject: [PATCH] Fixed the reversed relation for virtual fields (generic
 foreign keys).

---
 rest_framework/serializers.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index c788dec16..6a3432240 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -919,6 +919,7 @@ class ModelSerializer(Serializer):
         Restore the model instance.
         """
         m2m_data = {}
+        virtual_m2m_data = {}
         related_data = {}
         nested_forward_relations = {}
         meta = self.opts.model._meta
@@ -936,10 +937,16 @@ class ModelSerializer(Serializer):
                 m2m_data[field_name] = attrs.pop(field_name)
 
         # Forward m2m relations
-        for field in meta.many_to_many + meta.virtual_fields:
+        for field in meta.many_to_many:
             if field.name in attrs:
                 m2m_data[field.name] = attrs.pop(field.name)
 
+        # Virtual m2m relations
+        # This is mostly for GenericRelations
+        for field in meta.virtual_fields:
+            if field.name in attrs:
+                virtual_m2m_data[field.name] = attrs.pop(field.name)
+
         # Nested forward relations - These need to be marked so we can save
         # them before saving the parent model instance.
         for field_name in attrs.keys():
@@ -964,6 +971,7 @@ class ModelSerializer(Serializer):
         # at the point of save.
         instance._related_data = related_data
         instance._m2m_data = m2m_data
+        instance._virtual_m2m_data = virtual_m2m_data
         instance._nested_forward_relations = nested_forward_relations
 
         return instance
@@ -992,10 +1000,18 @@ class ModelSerializer(Serializer):
 
         if getattr(obj, '_m2m_data', None):
             for accessor_name, object_list in obj._m2m_data.items():
+                # We need to save m2m data before linking the objects together
                 [self.save_object(o) for o in object_list]
                 setattr(obj, accessor_name, object_list)
             del(obj._m2m_data)
 
+        if getattr(obj, '_virtual_m2m_data', None):
+            for accessor_name, object_list in obj._virtual_m2m_data.items():
+                # In case of GenericRelation, we have a FK as constraint
+                setattr(obj, accessor_name, object_list)
+                [self.save_object(o) for o in object_list]
+            del(obj._m2m_data)
+
         if getattr(obj, '_related_data', None):
             related_fields = dict([
                 (field.get_accessor_name(), field)