From 89a2216486fa8a0513cbb1d49d2d587d4116c60b Mon Sep 17 00:00:00 2001 From: redodo Date: Mon, 19 Nov 2018 19:11:04 +0100 Subject: Fixed #29961 -- Made RelatedFieldWidgetWrapper hide related item links if wrapping a hidden widget. --- .../contrib/admin/templates/admin/widgets/related_widget_wrapper.html | 2 ++ django/contrib/admin/widgets.py | 1 + 2 files changed, 3 insertions(+) (limited to 'django') 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 %} {% endif %} + {% endif %} {% endspaceless %} {% endblock %} 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, -- cgit v1.3