diff options
| author | Hasan Ramezani <hasan.r67@gmail.com> | 2021-05-19 23:22:26 +0200 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2021-05-26 10:20:13 +0200 |
| commit | 1143f3bb5ecaa2be58f2cd9077f147040291659d (patch) | |
| tree | fda6fd3bf2876cf1c78a8cab5310a2de22072168 /django | |
| parent | b46dbd4e3e255223078ae0028934ea986e19ebc1 (diff) | |
Fixed #32543 -- Added search_help_text to ModelAdmin.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 2 | ||||
| -rw-r--r-- | django/contrib/admin/static/admin/css/changelists.css | 4 | ||||
| -rw-r--r-- | django/contrib/admin/templates/admin/search_form.html | 4 | ||||
| -rw-r--r-- | django/contrib/admin/views/main.py | 4 |
4 files changed, 13 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 8ffc460177..f466614061 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -559,6 +559,7 @@ class ModelAdmin(BaseModelAdmin): list_max_show_all = 200 list_editable = () search_fields = () + search_help_text = None date_hierarchy = None save_as = False save_as_continue = True @@ -747,6 +748,7 @@ class ModelAdmin(BaseModelAdmin): self.list_editable, self, sortable_by, + self.search_help_text, ) def get_object(self, request, object_id, from_field=None): diff --git a/django/contrib/admin/static/admin/css/changelists.css b/django/contrib/admin/static/admin/css/changelists.css index b4a1557887..a4baf32955 100644 --- a/django/contrib/admin/static/admin/css/changelists.css +++ b/django/contrib/admin/static/admin/css/changelists.css @@ -125,6 +125,10 @@ margin-right: 4px; } +#changelist-search .help { + word-break: break-word; +} + /* FILTER COLUMN */ #changelist-filter { diff --git a/django/contrib/admin/templates/admin/search_form.html b/django/contrib/admin/templates/admin/search_form.html index 75c629cd62..fd7818a9f8 100644 --- a/django/contrib/admin/templates/admin/search_form.html +++ b/django/contrib/admin/templates/admin/search_form.html @@ -12,5 +12,9 @@ {% if pair.0 != search_var %}<input type="hidden" name="{{ pair.0 }}" value="{{ pair.1 }}">{% endif %} {% endfor %} </div> +{% if cl.search_help_text %} +<br class="clear"> +<div class="help">{{ cl.search_help_text }}</div> +{% endif %} </form></div> {% endif %} diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index e446cc716e..9ac557ea71 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -49,7 +49,8 @@ class ChangeList: def __init__(self, request, model, list_display, list_display_links, list_filter, date_hierarchy, search_fields, list_select_related, - list_per_page, list_max_show_all, list_editable, model_admin, sortable_by): + list_per_page, list_max_show_all, list_editable, model_admin, sortable_by, + search_help_text): self.model = model self.opts = model._meta self.lookup_opts = self.opts @@ -68,6 +69,7 @@ class ChangeList: self.model_admin = model_admin self.preserved_filters = model_admin.get_preserved_filters(request) self.sortable_by = sortable_by + self.search_help_text = search_help_text # Get search parameters from the query string. _search_form = self.search_form_class(request.GET) |