[3.0.x] Fixed #30014 -- Fixed ModelChoiceField validation when initial value is a model instance.

Thanks Carlton Gibson for reviews.

Backport of e7cdb0cd7eb5eb677af8dae7bfc6845186f861b0 from master

1 files changed, 2 insertions, 0 deletions

diff --git a/django/forms/models.py b/django/forms/models.py
index c7e7e50885..8b8be56b3b 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -1248,6 +1248,8 @@ class ModelChoiceField(ChoiceField):
             return None
         try:
             key = self.to_field_name or 'pk'
+            if isinstance(value, self.queryset.model):
+                value = getattr(value, key)
             value = self.queryset.get(**{key: value})
         except (ValueError, TypeError, self.queryset.model.DoesNotExist):
             raise ValidationError(self.error_messages['invalid_choice'], code='invalid_choice')