Allow proxy models in GenericForeignKey fields

re #9588
pulp · Dec 9, 2021 · 3cddf3a · 3cddf3a
1 parent c79da9c
commit 3cddf3a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/pulpcore/app/models/base.py b/pulpcore/app/models/base.py
@@ -31,7 +31,7 @@ class Label(LifecycleModel):
     key = models.CharField(max_length=200, db_index=True)
     value = models.TextField(null=True, db_index=True)
 
-    content_object = GenericForeignKey("content_type", "object_id")
+    content_object = GenericForeignKey("content_type", "object_id", for_concrete_model=False)
 
     class Meta:
         unique_together = [["content_type", "object_id", "key"]]

diff --git a/pulpcore/app/models/generic.py b/pulpcore/app/models/generic.py
@@ -22,7 +22,7 @@ class GenericRelationModel(BaseModel):
 
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
     object_id = models.UUIDField()
-    content_object = GenericForeignKey("content_type", "object_id")
+    content_object = GenericForeignKey("content_type", "object_id", for_concrete_model=False)
 
     class Meta:
         abstract = True
diff --git a/pulpcore/app/models/role.py b/pulpcore/app/models/role.py
@@ -44,7 +44,7 @@ class UserRole(BaseModel):
     role = models.ForeignKey(Role, related_name="object_users", on_delete=models.CASCADE)
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE, null=True)
     object_id = models.CharField(max_length=255, null=True)
-    content_object = GenericForeignKey("content_type", "object_id")
+    content_object = GenericForeignKey("content_type", "object_id", for_concrete_model=False)
 
     class Meta:
         unique_together = (("user", "role", "content_type", "object_id"),)
@@ -66,7 +66,7 @@ class GroupRole(BaseModel):
     role = models.ForeignKey(Role, related_name="object_groups", on_delete=models.CASCADE)
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE, null=True)
     object_id = models.CharField(max_length=255, null=True)
-    content_object = GenericForeignKey("content_type", "object_id")
+    content_object = GenericForeignKey("content_type", "object_id", for_concrete_model=False)
 
     class Meta:
         unique_together = (("group", "role", "content_type", "object_id"),)

diff --git a/pulpcore/app/serializers/user.py b/pulpcore/app/serializers/user.py
@@ -83,7 +83,7 @@ def to_internal_value(self, data):
         try:
             obj = NamedModelViewSet.get_resource(data)
         except serializers.ValidationError:
-            raise serializers.ValidationError(_("Invalid value for 'obj': {}.").format(data))
+            raise serializers.ValidationError(_("Invalid value: {}.").format(data))
         return {"content_object": obj}