summaryrefslogtreecommitdiff
path: root/django/contrib
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-12-21 08:36:41 -0500
committerTim Graham <timograham@gmail.com>2015-12-21 09:29:57 -0500
commitf18b08748abaecb171fdcbcdfdcd7e4d95d931d1 (patch)
tree9da20d693878a53151be5cf3482fa67505e9deba /django/contrib
parentd7580e286ac9c48e410d59281720205d6f5dda10 (diff)
Fixed #25903 -- Fixed the admin's list_editable add/change buttons.
Diffstat (limited to 'django/contrib')
-rw-r--r--django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js18
-rw-r--r--django/contrib/admin/static/admin/js/change_form.js18
2 files changed, 18 insertions, 18 deletions
diff --git a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
index 0d468d4b6d..86077ce38f 100644
--- a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
+++ b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
@@ -162,6 +162,24 @@
event.preventDefault();
opener.dismissRelatedLookupPopup(window, $(this).data("popup-opener"));
});
+ $('body').on('click', '.related-widget-wrapper-link', function(e) {
+ e.preventDefault();
+ if (this.href) {
+ var event = $.Event('django:show-related', {href: this.href});
+ $(this).trigger(event);
+ if (!event.isDefaultPrevented()) {
+ showRelatedObjectPopup(this);
+ }
+ }
+ });
+ $('body').on('change', '.related-widget-wrapper select', function(e) {
+ var event = $.Event('django:update-related');
+ $(this).trigger(event);
+ if (!event.isDefaultPrevented()) {
+ updateRelatedObjectLinks(this);
+ }
+ });
+ $('.related-widget-wrapper select').trigger('change');
});
})(django.jQuery);
diff --git a/django/contrib/admin/static/admin/js/change_form.js b/django/contrib/admin/static/admin/js/change_form.js
index 883376379f..921635f8b9 100644
--- a/django/contrib/admin/static/admin/js/change_form.js
+++ b/django/contrib/admin/static/admin/js/change_form.js
@@ -20,24 +20,6 @@
showRelatedObjectLookupPopup(this);
}
});
- $('body').on('click', '.related-widget-wrapper-link', function(e) {
- e.preventDefault();
- if (this.href) {
- var event = $.Event('django:show-related', {href: this.href});
- $(this).trigger(event);
- if (!event.isDefaultPrevented()) {
- showRelatedObjectPopup(this);
- }
- }
- });
- $('body').on('change', '.related-widget-wrapper select', function(e) {
- var event = $.Event('django:update-related');
- $(this).trigger(event);
- if (!event.isDefaultPrevented()) {
- updateRelatedObjectLinks(this);
- }
- });
- $('.related-widget-wrapper select').trigger('change');
if (modelName) {
$('form#' + modelName + '_form :input:visible:enabled:first').focus();