mirror of
https://github.com/django/django.git
synced 2025-10-03 23:34:47 +00:00
Fixed #24289 -- Reversed usage of Field.many_to_one and one_to_many.
Thanks Carl Meyer and Tim Graham for the reviews and to all involved in the discussion.
This commit is contained in:
parent
5c995dcfc2
commit
18c0aaa912
8 changed files with 34 additions and 34 deletions
|
@ -388,9 +388,9 @@ class Options(object):
|
|||
# and all the models may not have been loaded yet; we don't want to cache
|
||||
# the string reference to the related_model.
|
||||
is_not_an_m2m_field = lambda f: not (f.is_relation and f.many_to_many)
|
||||
is_not_a_generic_relation = lambda f: not (f.is_relation and f.many_to_one)
|
||||
is_not_a_generic_relation = lambda f: not (f.is_relation and f.one_to_many)
|
||||
is_not_a_generic_foreign_key = lambda f: not (
|
||||
f.is_relation and f.one_to_many and not (hasattr(f.rel, 'to') and f.rel.to)
|
||||
f.is_relation and f.many_to_one and not (hasattr(f.rel, 'to') and f.rel.to)
|
||||
)
|
||||
return make_immutable_fields_list(
|
||||
"fields",
|
||||
|
@ -564,7 +564,7 @@ class Options(object):
|
|||
for field in fields:
|
||||
# For backwards compatibility GenericForeignKey should not be
|
||||
# included in the results.
|
||||
if field.is_relation and field.one_to_many and field.related_model is None:
|
||||
if field.is_relation and field.many_to_one and field.related_model is None:
|
||||
continue
|
||||
|
||||
names.add(field.name)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue