Commit 69ddc1b3 authored by Luis Del Giudice's avatar Luis Del Giudice Committed by Markus Holtermann
Browse files

Fixed #24693 -- Added label and label_lower property to Model._meta

parent 811d7870

django/core/checks/messages.py

+1 −3
Original line number Diff line number Diff line
@@ -37,9 +37,7 @@ class CheckMessage(object): 
        elif isinstance(self.obj, models.base.ModelBase):

            # We need to hardcode ModelBase and Field cases because its __str__

            # method doesn't return "applabel.modellabel" and cannot be changed.

            model = self.obj

            app = model._meta.app_label

            obj = '%s.%s' % (app, model._meta.object_name)

            obj = self.obj._meta.label

        else:

            obj = force_str(self.obj)

        id = "(%s) " % self.id if self.id else ""

django/core/serializers/base.py

+2 −2
Original line number Diff line number Diff line
@@ -163,8 +163,8 @@ class DeserializedObject(object): 
        self.m2m_data = m2m_data



    def __repr__(self):

        return "<DeserializedObject: %s.%s(pk=%s)>" % (

            self.object._meta.app_label, self.object._meta.object_name, self.object.pk)

        return "<DeserializedObject: %s(pk=%s)>" % (

            self.object._meta.label, self.object.pk)



    def save(self, save_m2m=True, using=None):

        # Call save on the Model baseclass directly. This bypasses any

django/db/migrations/state.py

+3 −4
Original line number Diff line number Diff line
@@ -362,10 +362,9 @@ class ModelState(object): 
            try:

                fields.append((name, field_class(*args, **kwargs)))

            except TypeError as e:

                raise TypeError("Couldn't reconstruct field %s on %s.%s: %s" % (

                raise TypeError("Couldn't reconstruct field %s on %s: %s" % (

                    name,

                    model._meta.app_label,

                    model._meta.object_name,

                    model._meta.label,

                    e,

                ))

        if not exclude_rels:
@@ -423,7 +422,7 @@ class ModelState(object): 
        # Make our record

        bases = tuple(

            (

                "%s.%s" % (base._meta.app_label, base._meta.model_name)

                base._meta.label_lower

                if hasattr(base, "_meta") else

                base

            )

django/db/models/base.py

+2 −7
Original line number Diff line number Diff line
@@ -326,9 +326,7 @@ class ModelBase(type): 
        if cls.__doc__ is None:

            cls.__doc__ = "%s(%s)" % (cls.__name__, ", ".join(f.name for f in opts.fields))



        get_absolute_url_override = settings.ABSOLUTE_URL_OVERRIDES.get(

            '%s.%s' % (opts.app_label, opts.model_name)

        )

        get_absolute_url_override = settings.ABSOLUTE_URL_OVERRIDES.get(opts.label_lower)

        if get_absolute_url_override:

            setattr(cls, 'get_absolute_url', get_absolute_url_override)
@@ -1248,10 +1246,7 @@ class Model(six.with_metaclass(ModelBase)): 
                errors.append(

                    checks.Error(

                        "The model has two many-to-many relations through "

                        "the intermediate model '%s.%s'." % (

                            f.remote_field.through._meta.app_label,

                            f.remote_field.through._meta.object_name

                        ),

                        "the intermediate model '%s'." % f.remote_field.through._meta.label,

                        hint=None,

                        obj=cls,

                        id='models.E003',

django/db/models/manager.py

+1 −3
Original line number Diff line number Diff line
@@ -76,9 +76,7 @@ class BaseManager(object): 


    def __str__(self):

        """ Return "app_label.model_label.manager_name". """

        model = self.model

        app = model._meta.app_label

        return '%s.%s.%s' % (app, model._meta.object_name, self.name)

        return '%s.%s' % (self.model._meta.label, self.name)



    def deconstruct(self):

        """