diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index 3bc1034492..c19f79c25a 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -1,7 +1,8 @@ from django.core.template.decorators import simple_tag, inclusion_tag from django.contrib.admin.views.main import MAX_SHOW_ALL_ALLOWED, DEFAULT_RESULTS_PER_PAGE, ALL_VAR, \ - ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR , SEARCH_VAR , IS_POPUP_VAR, EMPTY_CHANGELIST_VALUE + ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR , SEARCH_VAR , IS_POPUP_VAR, EMPTY_CHANGELIST_VALUE, \ + MONTHS from django.core import meta from django.utils.text import capfirst diff --git a/docs/model-api.txt b/docs/model-api.txt index 3522585e7a..edf94dd17c 100644 --- a/docs/model-api.txt +++ b/docs/model-api.txt @@ -621,6 +621,14 @@ the relationship should work. All are optional: vertically). ``limit_choices_to`` See the description under ``ForeignKey`` above. + + ``singular`` The singular name of the field. Use to name the ``get_*`` + methods: in the example above, Django gives the ``Pizza`` + objects a ``get_topping_list()`` method, where ``topping`` + is the default ``singular`` value derived from the lowercase + version of the class being linked to. Use the singular + parameter to change this, which is if you want one model to + have multiple ``ManyToMany`` relationships to another model. ======================= ============================================================ One-to-one relationships