Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/django/contrib/admin/static/admin/js/actions.js b/django/contrib/admin/static/admin/js/actions.js
- index 7041701..d9b63b2 100644
- --- a/django/contrib/admin/static/admin/js/actions.js
- +++ b/django/contrib/admin/static/admin/js/actions.js
- @@ -145,9 +145,12 @@
- selectedClass: "selected"
- };
- $(document).ready(function() {
- - var $actionsEls = $('tr input.action-select');
- - if ($actionsEls.length > 0) {
- - $actionsEls.actions();
- + var $actions = $('.actions');
- + if ($actions.length > 0 && !$actions.data().disableDocumentReady) {
- + var $actionsEls = $('tr input.action-select');
- + if ($actionsEls.length > 0) {
- + $actionsEls.actions();
- + }
- }
- });
- })(django.jQuery);
- diff --git a/django/contrib/admin/static/admin/js/inlines.js b/django/contrib/admin/static/admin/js/inlines.js
- index a284d76..2ea4f6a 100644
- --- a/django/contrib/admin/static/admin/js/inlines.js
- +++ b/django/contrib/admin/static/admin/js/inlines.js
- @@ -277,13 +277,15 @@
- $(".js-inline-admin-formset").each(function() {
- var data = $(this).data(),
- inlineOptions = data.inlineFormset;
- - switch(data.inlineType) {
- - case "stacked":
- - $(inlineOptions.name + "-group .inline-related").stackedFormset(inlineOptions.options);
- - break;
- - case "tabular":
- - $(inlineOptions.name + "-group .tabular.inline-related tbody tr").tabularFormset(inlineOptions.options);
- - break;
- + if (!data.disableDocumentReady) {
- + switch(data.inlineType) {
- + case "stacked":
- + $(inlineOptions.name + "-group .inline-related").stackedFormset(inlineOptions.options);
- + break;
- + case "tabular":
- + $(inlineOptions.name + "-group .tabular.inline-related tbody tr").tabularFormset(inlineOptions.options);
- + break;
- + }
- }
- });
- });
Advertisement
Add Comment
Please, Sign In to add comment