summaryrefslogtreecommitdiff
path: root/django/contrib/admin
diff options
context:
space:
mode:
authorredodo <me@redodo.io>2018-11-19 19:11:04 +0100
committerTim Graham <timograham@gmail.com>2018-11-19 15:12:52 -0500
commit89a2216486fa8a0513cbb1d49d2d587d4116c60b (patch)
tree3c9f407779bad901ee9e9c6c5b07162cb4d0102d /django/contrib/admin
parentebd270627c3350101959fac59650259f2d33efcf (diff)
Fixed #29961 -- Made RelatedFieldWidgetWrapper hide related item links if wrapping a hidden widget.
Diffstat (limited to 'django/contrib/admin')
-rw-r--r--django/contrib/admin/templates/admin/widgets/related_widget_wrapper.html2
-rw-r--r--django/contrib/admin/widgets.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/django/contrib/admin/templates/admin/widgets/related_widget_wrapper.html b/django/contrib/admin/templates/admin/widgets/related_widget_wrapper.html
index 281d331443..7cdcb334c9 100644
--- a/django/contrib/admin/templates/admin/widgets/related_widget_wrapper.html
+++ b/django/contrib/admin/templates/admin/widgets/related_widget_wrapper.html
@@ -3,6 +3,7 @@
{{ rendered_widget }}
{% block links %}
{% spaceless %}
+ {% if not is_hidden %}
{% if can_change_related %}
<a class="related-widget-wrapper-link change-related" id="change_id_{{ name }}"
data-href-template="{{ change_related_template_url }}?{{ url_params }}"
@@ -24,6 +25,7 @@
<img src="{% static 'admin/img/icon-deletelink.svg' %}" alt="{% trans 'Delete' %}">
</a>
{% endif %}
+ {% endif %}
{% endspaceless %}
{% endblock %}
</div>
diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
index 9385104d59..81dbcaf236 100644
--- a/django/contrib/admin/widgets.py
+++ b/django/contrib/admin/widgets.py
@@ -285,6 +285,7 @@ class RelatedFieldWidgetWrapper(forms.Widget):
])
context = {
'rendered_widget': self.widget.render(name, value, attrs),
+ 'is_hidden': self.is_hidden,
'name': name,
'url_params': url_params,
'model': rel_opts.verbose_name,