diff options
| author | Adam Johnson <me@adamj.eu> | 2024-02-23 22:50:09 +0000 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2024-02-26 05:38:31 +0100 |
| commit | 73d5eb808435bcf27ebc935847196ac9e97b6ddc (patch) | |
| tree | 5a51e44efa2d3dc92c29c6fa4f1001a11344a9df /django/forms | |
| parent | 6e1ece7ed522c904a674966fa985159b7bbf1545 (diff) | |
Fixed #35241 -- Cached model's full parent list.
co-authored-by: Keryn Knight <keryn@kerynknight.com>
co-authored-by: Natalia <124304+nessita@users.noreply.github.com>
co-authored-by: David Smith <smithdc@gmail.com>
co-authored-by: Paolo Melchiorre <paolo@melchiorre.org>
Diffstat (limited to 'django/forms')
| -rw-r--r-- | django/forms/models.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/django/forms/models.py b/django/forms/models.py index 4b11d5af8c..4cda4e534e 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -1214,20 +1214,19 @@ def _get_foreign_key(parent_model, model, fk_name=None, can_fail=False): fks_to_parent = [f for f in opts.fields if f.name == fk_name] if len(fks_to_parent) == 1: fk = fks_to_parent[0] - parent_list = parent_model._meta.get_parent_list() - parent_list.append(parent_model) + all_parents = (*parent_model._meta.all_parents, parent_model) if ( not isinstance(fk, ForeignKey) or ( # ForeignKey to proxy models. fk.remote_field.model._meta.proxy - and fk.remote_field.model._meta.proxy_for_model not in parent_list + and fk.remote_field.model._meta.proxy_for_model not in all_parents ) or ( # ForeignKey to concrete models. not fk.remote_field.model._meta.proxy and fk.remote_field.model != parent_model - and fk.remote_field.model not in parent_list + and fk.remote_field.model not in all_parents ) ): raise ValueError( @@ -1240,18 +1239,17 @@ def _get_foreign_key(parent_model, model, fk_name=None, can_fail=False): ) else: # Try to discover what the ForeignKey from model to parent_model is - parent_list = parent_model._meta.get_parent_list() - parent_list.append(parent_model) + all_parents = (*parent_model._meta.all_parents, parent_model) fks_to_parent = [ f for f in opts.fields if isinstance(f, ForeignKey) and ( f.remote_field.model == parent_model - or f.remote_field.model in parent_list + or f.remote_field.model in all_parents or ( f.remote_field.model._meta.proxy - and f.remote_field.model._meta.proxy_for_model in parent_list + and f.remote_field.model._meta.proxy_for_model in all_parents ) ) ] |