Commit 20b621eb authored by Loic Bistuer's avatar Loic Bistuer
Browse files

[1.8.x] 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.

Backport of 18c0aaa9 from master
parent 136edac8

django/contrib/admin/utils.py

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ def _get_non_gfk_field(opts, name): 
    "not found" by get_field(). This could likely be cleaned up.

    """

    field = opts.get_field(name)

    if field.is_relation and field.one_to_many and not field.related_model:

    if field.is_relation and field.many_to_one and not field.related_model:

        raise FieldDoesNotExist()

    return field

django/contrib/contenttypes/fields.py

+4 −4
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ class GenericForeignKey(object): 


    is_relation = True

    many_to_many = False

    many_to_one = False

    one_to_many = True

    many_to_one = True

    one_to_many = False

    one_to_one = False

    related_model = None
@@ -258,8 +258,8 @@ class GenericRelation(ForeignObject): 
    auto_created = False



    many_to_many = False

    many_to_one = True

    one_to_many = False

    many_to_one = False

    one_to_many = True

    one_to_one = False



    def __init__(self, to, **kwargs):

django/db/models/deletion.py

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ def get_candidate_relations_to_delete(opts): 
    # N-N  (i.e., many-to-many) relations aren't candidates for deletion.

    return (

        f for f in candidate_model_fields

        if f.auto_created and not f.concrete and (f.one_to_one or f.many_to_one)

        if f.auto_created and not f.concrete and (f.one_to_one or f.one_to_many)

    )

django/db/models/fields/related.py

+4 −4
Original line number Diff line number Diff line
@@ -1475,8 +1475,8 @@ class ManyToManyRel(ForeignObjectRel): 
class ForeignObject(RelatedField):

    # Field flags

    many_to_many = False

    many_to_one = False

    one_to_many = True

    many_to_one = True

    one_to_many = False

    one_to_one = False



    requires_unique_target = True
@@ -1785,8 +1785,8 @@ class ForeignObject(RelatedField): 
class ForeignKey(ForeignObject):

    # Field flags

    many_to_many = False

    many_to_one = False

    one_to_many = True

    many_to_one = True

    one_to_many = False

    one_to_one = False



    empty_strings_allowed = False

django/db/models/options.py

+3 −3
Original line number Diff line number Diff line
@@ -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)