summaryrefslogtreecommitdiff
path: root/django/contrib/admin/templates
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2006-02-27 18:52:54 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2006-02-27 18:52:54 +0000
commit0df9fb8f9abdb0fbc1ba8b249ae9b71cc06af8e2 (patch)
treea803b9ea15d2eeb4c69bd0017c8296e69e4e0711 /django/contrib/admin/templates
parent3723f8379887a3f47d70ca1e8b743154d62beac0 (diff)
Fixed #620 -- raw_id_admin and limit_choices_to now play well together (thanks to David Schein)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/contrib/admin/templates')
-rw-r--r--django/contrib/admin/templates/widget/foreign.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/contrib/admin/templates/widget/foreign.html b/django/contrib/admin/templates/widget/foreign.html
index 1ac9b29844..582d65df7f 100644
--- a/django/contrib/admin/templates/widget/foreign.html
+++ b/django/contrib/admin/templates/widget/foreign.html
@@ -1,7 +1,11 @@
{% load admin_modify adminmedia %}
{% output_all bound_field.form_fields %}
{% if bound_field.raw_id_admin %}
+{% if bound_field.field.rel.limit_choices_to %}
+ <a href="../../../{{ bound_field.field.rel.to.app_label }}/{{ bound_field.field.rel.to.module_name }}/?{% for limit_choice in bound_field.field.rel.limit_choices_to.items %}{% if not forloop.first %}{{"&"|escape}}{% endif %}{{ limit_choice|join:"=" }}{% endfor %}" class="related-lookup" id="lookup_{{ bound_field.element_id }}" onclick="return showRelatedObjectLookupPopup(this);"> <img src="{% admin_media_prefix %}img/admin/selector-search.gif" width="16" height="16" alt="Lookup"></a>
+{% else %}
<a href="../../../{{ bound_field.field.rel.to.app_label }}/{{ bound_field.field.rel.to.module_name }}/" class="related-lookup" id="lookup_{{ bound_field.element_id }}" onclick="return showRelatedObjectLookupPopup(this);"> <img src="{% admin_media_prefix %}img/admin/selector-search.gif" width="16" height="16" alt="Lookup"></a>
+{% endif %}
{% else %}
{% if bound_field.needs_add_label %}
<a href="../../../{{ bound_field.field.rel.to.app_label }}/{{ bound_field.field.rel.to.module_name }}/add/" class="add-another" id="add_{{ bound_field.element_id }}" onclick="return showAddAnotherPopup(this);"> <img src="{% admin_media_prefix %}img/admin/icon_addlink.gif" width="10" height="10" alt="Add Another"/></a>