Ticket #17310: kill_test.2.patch

models.py

@@ -5 +5 @@
 
 class Award(models.Model):
     name = models.CharField(max_length=25)
-    object_id = models.PositiveIntegerField()
-    content_type = models.ForeignKey(ContentType)
-    content_object = generic.GenericForeignKey()
+    app_object_id = models.PositiveIntegerField()
+    app_content_type = models.ForeignKey(ContentType)
+    content_object = generic.GenericForeignKey('app_content_type', 'app_object_id')
 
 class AwardNote(models.Model):
     award = models.ForeignKey(Award)
@@ -15 +15 @@
 
 class Person(models.Model):
     name = models.CharField(max_length=25)
-    awards = generic.GenericRelation(Award)
+    awards = generic.GenericRelation(Award,
+                                     content_type_field= 'app_content_type',
+                                     object_id_field='app_object_id')
 
 class Book(models.Model):
     pagecount = models.IntegerField()