diff --git a/django/forms/models.py b/django/forms/models.py index 0fba08855fc..ac8bd1c8608 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -376,6 +376,11 @@ class BaseModelForm(BaseForm): exclude = self._get_validation_exclusions() + try: + self.instance = construct_instance(self, self.instance, opts.fields, exclude) + except ValidationError as e: + self._update_errors(e) + # Foreign Keys being used to represent inline relationships # are excluded from basic field value validation. This is for two # reasons: firstly, the value may not be supplied (#12507; the @@ -387,11 +392,6 @@ class BaseModelForm(BaseForm): if isinstance(field, InlineForeignKeyField): exclude.append(name) - try: - self.instance = construct_instance(self, self.instance, opts.fields, exclude) - except ValidationError as e: - self._update_errors(e) - try: self.instance.full_clean(exclude=exclude, validate_unique=False) except ValidationError as e: diff --git a/docs/releases/1.8.5.txt b/docs/releases/1.8.5.txt index ce03577cde4..9cdd8020578 100644 --- a/docs/releases/1.8.5.txt +++ b/docs/releases/1.8.5.txt @@ -43,3 +43,6 @@ Bugfixes * Moved the :ref:`unsaved model instance assignment data loss check ` on reverse relations to ``Model.save()`` (:ticket:`25160`). + +* Readded inline foreign keys to form instances when validating model formsets + (:ticket:`25431`). diff --git a/tests/model_formsets/models.py b/tests/model_formsets/models.py index df6a68792b2..7b7337fd525 100644 --- a/tests/model_formsets/models.py +++ b/tests/model_formsets/models.py @@ -37,6 +37,10 @@ class Book(models.Model): def __str__(self): return self.title + def clean(self): + # Ensure author is always accessible in clean method + assert self.author.name is not None + @python_2_unicode_compatible class BookWithCustomPK(models.Model):