1
0
mirror of https://github.com/django/django.git synced 2025-03-31 19:46:42 +00:00

Fixed #33267 -- Added link to related item to related widget wrapper in admin.

This commit is contained in:
Shubh1815 2022-01-10 19:04:24 +05:30 committed by Mariusz Felisiak
parent 18245b948b
commit 11cc227344
6 changed files with 30 additions and 3 deletions

View File

@ -125,7 +125,7 @@
this.textContent = newRepr; this.textContent = newRepr;
this.value = newId; this.value = newId;
} }
}); }).trigger('change');
selects.next().find('.select2-selection__rendered').each(function() { selects.next().find('.select2-selection__rendered').each(function() {
// The element can have a clear button as a child. // The element can have a clear button as a child.
// Use the lastChild to modify only the displayed value. // Use the lastChild to modify only the displayed value.
@ -178,7 +178,7 @@
event.preventDefault(); event.preventDefault();
opener.dismissRelatedLookupPopup(window, $(this).data("popup-opener")); opener.dismissRelatedLookupPopup(window, $(this).data("popup-opener"));
}); });
$('body').on('click', '.related-widget-wrapper-link', function(e) { $('body').on('click', '.related-widget-wrapper-link[data-popup="yes"]', function(e) {
e.preventDefault(); e.preventDefault();
if (this.href) { if (this.href) {
const event = $.Event('django:show-related', {href: this.href}); const event = $.Event('django:show-related', {href: this.href});

View File

@ -7,12 +7,14 @@
{% if can_change_related %} {% if can_change_related %}
<a class="related-widget-wrapper-link change-related" id="change_id_{{ name }}" <a class="related-widget-wrapper-link change-related" id="change_id_{{ name }}"
data-href-template="{{ change_related_template_url }}?{{ url_params }}" data-href-template="{{ change_related_template_url }}?{{ url_params }}"
data-popup="yes"
title="{% blocktranslate %}Change selected {{ model }}{% endblocktranslate %}"> title="{% blocktranslate %}Change selected {{ model }}{% endblocktranslate %}">
<img src="{% static 'admin/img/icon-changelink.svg' %}" alt="{% translate 'Change' %}"> <img src="{% static 'admin/img/icon-changelink.svg' %}" alt="{% translate 'Change' %}">
</a> </a>
{% endif %} {% endif %}
{% if can_add_related %} {% if can_add_related %}
<a class="related-widget-wrapper-link add-related" id="add_id_{{ name }}" <a class="related-widget-wrapper-link add-related" id="add_id_{{ name }}"
data-popup="yes"
href="{{ add_related_url }}?{{ url_params }}" href="{{ add_related_url }}?{{ url_params }}"
title="{% blocktranslate %}Add another {{ model }}{% endblocktranslate %}"> title="{% blocktranslate %}Add another {{ model }}{% endblocktranslate %}">
<img src="{% static 'admin/img/icon-addlink.svg' %}" alt="{% translate 'Add' %}"> <img src="{% static 'admin/img/icon-addlink.svg' %}" alt="{% translate 'Add' %}">
@ -21,10 +23,18 @@
{% if can_delete_related %} {% if can_delete_related %}
<a class="related-widget-wrapper-link delete-related" id="delete_id_{{ name }}" <a class="related-widget-wrapper-link delete-related" id="delete_id_{{ name }}"
data-href-template="{{ delete_related_template_url }}?{{ url_params }}" data-href-template="{{ delete_related_template_url }}?{{ url_params }}"
data-popup="yes"
title="{% blocktranslate %}Delete selected {{ model }}{% endblocktranslate %}"> title="{% blocktranslate %}Delete selected {{ model }}{% endblocktranslate %}">
<img src="{% static 'admin/img/icon-deletelink.svg' %}" alt="{% translate 'Delete' %}"> <img src="{% static 'admin/img/icon-deletelink.svg' %}" alt="{% translate 'Delete' %}">
</a> </a>
{% endif %} {% endif %}
{% if can_view_related %}
<a class="related-widget-wrapper-link view-related" id="view_id_{{ name }}"
data-href-template="{{ change_related_template_url }}?{{ view_related_url_params }}"
title="{% blocktranslate %}View selected {{ model }}{% endblocktranslate %}">
<img src="{% static 'admin/img/icon-viewlink.svg' %}" alt="{% translate 'View' %}">
</a>
{% endif %}
{% endif %} {% endif %}
{% endspaceless %} {% endspaceless %}
{% endblock %} {% endblock %}

View File

@ -300,10 +300,11 @@ class RelatedFieldWidgetWrapper(forms.Widget):
rel_opts = self.rel.model._meta rel_opts = self.rel.model._meta
info = (rel_opts.app_label, rel_opts.model_name) info = (rel_opts.app_label, rel_opts.model_name)
self.widget.choices = self.choices self.widget.choices = self.choices
related_field_name = self.rel.get_related_field().name
url_params = "&".join( url_params = "&".join(
"%s=%s" % param "%s=%s" % param
for param in [ for param in [
(TO_FIELD_VAR, self.rel.get_related_field().name), (TO_FIELD_VAR, related_field_name),
(IS_POPUP_VAR, 1), (IS_POPUP_VAR, 1),
] ]
) )
@ -325,6 +326,7 @@ class RelatedFieldWidgetWrapper(forms.Widget):
info, "delete", "__fk__" info, "delete", "__fk__"
) )
if self.can_view_related or self.can_change_related: if self.can_view_related or self.can_change_related:
context["view_related_url_params"] = f"{TO_FIELD_VAR}={related_field_name}"
context["change_related_template_url"] = self.get_related_url( context["change_related_template_url"] = self.get_related_url(
info, "change", "__fk__" info, "change", "__fk__"
) )

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

View File

@ -61,6 +61,8 @@ Minor features
* The admin :meth:`history view <django.contrib.admin.ModelAdmin.history_view>` * The admin :meth:`history view <django.contrib.admin.ModelAdmin.history_view>`
is now paginated. is now paginated.
* Related widget wrappers now have a link to object's change form.
:mod:`django.contrib.admindocs` :mod:`django.contrib.admindocs`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

View File

@ -1675,6 +1675,7 @@ class AdminRawIdWidgetSeleniumTests(AdminWidgetSeleniumTestCase):
class RelatedFieldWidgetSeleniumTests(AdminWidgetSeleniumTestCase): class RelatedFieldWidgetSeleniumTests(AdminWidgetSeleniumTestCase):
def test_ForeignKey_using_to_field(self): def test_ForeignKey_using_to_field(self):
from selenium.webdriver.common.by import By from selenium.webdriver.common.by import By
from selenium.webdriver.support.ui import Select
self.admin_login(username="super", password="secret", login_url="/") self.admin_login(username="super", password="secret", login_url="/")
self.selenium.get( self.selenium.get(
@ -1698,6 +1699,12 @@ class RelatedFieldWidgetSeleniumTests(AdminWidgetSeleniumTestCase):
# The field now contains the new user # The field now contains the new user
self.selenium.find_element(By.CSS_SELECTOR, "#id_user option[value=newuser]") self.selenium.find_element(By.CSS_SELECTOR, "#id_user option[value=newuser]")
self.selenium.find_element(By.ID, "view_id_user").click()
self.wait_for_value("#id_username", "newuser")
self.selenium.back()
select = Select(self.selenium.find_element(By.ID, "id_user"))
select.select_by_value("newuser")
# Click the Change User button to change it # Click the Change User button to change it
self.selenium.find_element(By.ID, "change_id_user").click() self.selenium.find_element(By.ID, "change_id_user").click()
self.wait_for_and_switch_to_popup() self.wait_for_and_switch_to_popup()
@ -1714,6 +1721,12 @@ class RelatedFieldWidgetSeleniumTests(AdminWidgetSeleniumTestCase):
By.CSS_SELECTOR, "#id_user option[value=changednewuser]" By.CSS_SELECTOR, "#id_user option[value=changednewuser]"
) )
self.selenium.find_element(By.ID, "view_id_user").click()
self.wait_for_value("#id_username", "changednewuser")
self.selenium.back()
select = Select(self.selenium.find_element(By.ID, "id_user"))
select.select_by_value("changednewuser")
# Go ahead and submit the form to make sure it works # Go ahead and submit the form to make sure it works
self.selenium.find_element(By.CSS_SELECTOR, save_button_css_selector).click() self.selenium.find_element(By.CSS_SELECTOR, save_button_css_selector).click()
self.wait_for_text( self.wait_for_text(