From 20d487c27b40bb70496ddc7419011ca78b7d4940 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 29 Dec 2013 18:42:12 +0100 Subject: [PATCH] Replaced Options.object_name.lower() by Options.model_name. Thanks Simon for the suggestion. Also removed inappropriate lowercasing of app labels in migrations. Unlike model names, they are case sensitive. --- .../admin/templates/admin/auth/user/change_password.html | 2 +- django/contrib/admin/templates/admin/change_form.html | 2 +- django/contrib/admin/templates/admin/change_list.html | 2 +- django/contrib/admin/templates/admin/delete_confirmation.html | 2 +- .../admin/templates/admin/delete_selected_confirmation.html | 2 +- django/contrib/admindocs/templates/admin_doc/model_index.html | 2 +- django/db/migrations/autodetector.py | 4 ++-- django/db/migrations/state.py | 2 +- django/db/models/fields/related.py | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/django/contrib/admin/templates/admin/auth/user/change_password.html b/django/contrib/admin/templates/admin/auth/user/change_password.html index 3634ed4083..f37f35c6a3 100644 --- a/django/contrib/admin/templates/admin/auth/user/change_password.html +++ b/django/contrib/admin/templates/admin/auth/user/change_password.html @@ -6,7 +6,7 @@ {% endblock %} {% block extrastyle %}{{ block.super }}{% endblock %} -{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} +{% block bodyclass %}{{ opts.app_label }}-{{ opts.model_name }} change-form{% endblock %} {% if not is_popup %} {% block breadcrumbs %}
diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index be2cd862d4..bd71d97f3c 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -10,7 +10,7 @@ {% block coltype %}colM{% endblock %} -{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.object_name.lower }} change-form{% endblock %} +{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %} {% if not is_popup %} {% block breadcrumbs %} diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index 766a7c0fe6..407b0e0774 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -32,7 +32,7 @@ {% endif %}{% endif %} {% endblock %} -{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.object_name.lower }} change-list{% endblock %} +{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.model_name }} change-list{% endblock %} {% if not is_popup %} {% block breadcrumbs %} diff --git a/django/contrib/admin/templates/admin/delete_confirmation.html b/django/contrib/admin/templates/admin/delete_confirmation.html index c2057a635e..8e8962ff08 100644 --- a/django/contrib/admin/templates/admin/delete_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_confirmation.html @@ -1,7 +1,7 @@ {% extends "admin/base_site.html" %} {% load i18n admin_urls %} -{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.object_name.lower }} delete-confirmation{% endblock %} +{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation{% endblock %} {% block breadcrumbs %}
diff --git a/django/contrib/admin/templates/admin/delete_selected_confirmation.html b/django/contrib/admin/templates/admin/delete_selected_confirmation.html index a8f059fd46..3013c6a235 100644 --- a/django/contrib/admin/templates/admin/delete_selected_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_selected_confirmation.html @@ -1,7 +1,7 @@ {% extends "admin/base_site.html" %} {% load i18n l10n admin_urls %} -{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.object_name.lower }} delete-confirmation delete-selected-confirmation{% endblock %} +{% block bodyclass %}app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation delete-selected-confirmation{% endblock %} {% block breadcrumbs %}
diff --git a/django/contrib/admindocs/templates/admin_doc/model_index.html b/django/contrib/admindocs/templates/admin_doc/model_index.html index d4cde8334f..f48f80dd9f 100644 --- a/django/contrib/admindocs/templates/admin_doc/model_index.html +++ b/django/contrib/admindocs/templates/admin_doc/model_index.html @@ -27,7 +27,7 @@ {% for model in group.list %} - + {% endfor %}
{{ model.object_name }}{{ model.object_name }}
diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py index f71d193960..b98aef2f9a 100644 --- a/django/db/migrations/autodetector.py +++ b/django/db/migrations/autodetector.py @@ -71,9 +71,9 @@ class MigrationAutodetector(object): for field in new_apps.get_model(app_label, model_name)._meta.local_fields: if field.rel: if field.rel.to: - related_fields.append((field.name, field.rel.to._meta.app_label.lower(), field.rel.to._meta.object_name.lower())) + related_fields.append((field.name, field.rel.to._meta.app_label, field.rel.to._meta.model_name)) if hasattr(field.rel, "through") and not field.rel.though._meta.auto_created: - related_fields.append((field.name, field.rel.through._meta.app_label.lower(), field.rel.through._meta.object_name.lower())) + related_fields.append((field.name, field.rel.through._meta.app_label, field.rel.through._meta.model_name)) if related_fields: pending_add[app_label, model_name] = related_fields else: diff --git a/django/db/migrations/state.py b/django/db/migrations/state.py index 7eedcdbac6..fcf639837e 100644 --- a/django/db/migrations/state.py +++ b/django/db/migrations/state.py @@ -152,7 +152,7 @@ class ModelState(object): options[name] = model._meta.original_attrs[name] # Make our record bases = tuple( - ("%s.%s" % (base._meta.app_label, base._meta.object_name.lower()) if hasattr(base, "_meta") else base) + ("%s.%s" % (base._meta.app_label, base._meta.model_name) if hasattr(base, "_meta") else base) for base in model.__bases__ if (not hasattr(base, "_meta") or not base._meta.abstract) ) diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index beaa48c6f1..82e7725dac 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -1278,7 +1278,7 @@ class ForeignKey(ForeignObject): def __init__(self, to, to_field=None, rel_class=ManyToOneRel, db_constraint=True, **kwargs): try: - to._meta.object_name.lower() + to._meta.model_name except AttributeError: # to._meta doesn't exist, so it must be RECURSIVE_RELATIONSHIP_CONSTANT assert isinstance(to, six.string_types), "%s(%r) is invalid. First parameter to ForeignKey must be either a model, a model name, or the string %r" % (self.__class__.__name__, to, RECURSIVE_RELATIONSHIP_CONSTANT) else: