Ticket #8483: 8483-generic_fk_validations.diff

django/contrib/admin/validation.py

@@ -8 +8 @@
 from django.forms.models import BaseModelForm, BaseModelFormSet, fields_for_model
 from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin
 from django.contrib.admin.options import HORIZONTAL, VERTICAL
+from django.contrib.contenttypes import generic
 
 __all__ = ['validate']
 
@@ -149 +150 @@
                 raise ImproperlyConfigured("'%s.inlines[%d].model' does not "
                         "inherit from models.Model." % (cls.__name__, idx))
             validate_base(inline, inline.model)
-            validate_inline(inline)
+            validate_inline(inline, model)
 
-def validate_inline(cls):
+def validate_inline(cls, parent_model):
     # model is already verified to exist and be a Model
     if cls.fk_name: # default value is None
         f = get_field(cls, cls.model, cls.model._meta, 'fk_name', cls.fk_name)
         if not isinstance(f, models.ForeignKey):
             raise ImproperlyConfigured("'%s.fk_name is not an instance of "
                     "models.ForeignKey." % cls.__name__)
+    elif issubclass(cls, generic.GenericInlineModelAdmin):
+        # generic relationship inlines
+        validate_generic_inline(cls, parent_model)
+
     # extra = 3
     # max_num = 0
     for attr in ('extra', 'max_num'):
@@ -304 +309 @@
     except AttributeError:
         raise ImproperlyConfigured("'%s.%s' refers to '%s' that is neither a field, method or property of model '%s'."
             % (cls.__name__, label, field, model.__name__))
+
+def validate_generic_inline(cls, parent_model):
+    opts = cls.model._meta
+    for f in opts.virtual_fields:
+        if isinstance(f, generic.GenericForeignKey):
+            break
+    else:
+        raise ImproperlyConfigured("'%s' is a generic inline, but the model "
+            "it is being associated with (%s) has no generic foreing key field."
+            % (cls.__name__, cls.model.__name__))
+    for gr in opts.fields:
+        if gr.name == f.fk_field:
+            break
+    else:
+        raise ImproperlyConfigured("'%s' is a generic inline, but the model "
+            "it is being associated with (%s) has not a properly set up "
+            "fk_field field." % (cls.__name__, cls.model.__name__))
+
+    if gr.__class__ is not parent_model._meta.pk.__class__:
+        raise ImproperlyConfigured("Model %s associated with generic inline "
+            "'%s' has a %s field whose type doesn't match the type of "
+            "the primary key of the model it is being related to (%s)."
+            % (cls.model.__name__, cls.__name__, f.fk_field,
+                parent_model.__name__))