Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: initialize dropzoneSelector inside inline formsets in a Django 4.1 compatible way #1431

Merged
merged 3 commits into from
Oct 2, 2023
+25 −12
Merged

fix: initialize dropzoneSelector inside inline formsets in a Django 4.1 compatible way #1431

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d9ca31
fix: initialize dropzoneSelector inside inline formsets in a Django 4…
mbi Oct 2, 2023
797fd21
fix: double-check that ev.detail exists
mbi Oct 2, 2023
bfa7045
chore: drop support for Django < 1.9 in the dropzone init handler
mbi Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions filer/static/filer/js/addons/dropzone.init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,18 +160,31 @@ djQuery(function ($) {
Dropzone.autoDiscover = false;
}
dropzones.each(createDropzone);
// window.__admin_utc_offset__ is used as canary to detect Django 1.8
// There is no way to feature detect the new behavior implemented in Django 1.9
if (!window.__admin_utc_offset__) {
$(document).on('formset:added', function (ev, row) {

// Handle initialization of the dropzone on dynamic formsets (i.e. Django admin inlines)
$(document).on('formset:added', function (ev, row) {
if(ev.detail && ev.detail.formsetName) {
/*
Django 4.1 changed the event type being fired when adding
a new formset from a jQuery to a vanilla JavaScript event.
https://docs.djangoproject.com/en/4.1/ref/contrib/admin/javascript/

In this case we find the newly added row and initialize the
dropzone on any dropzoneSelector on that row.
*/
let rowIdx = parseInt(
document.getElementById(
'id_' + event.detail.formsetName + '-TOTAL_FORMS'
).value, 10
) - 1;
let row_ = document.getElementById(event.detail.formsetName + '-' + rowIdx);
var dropzones = $(row_).find(dropzoneSelector)

} else {
var dropzones = $(row).find(dropzoneSelector);
dropzones.each(createDropzone);
});
} else {
$('.add-row a').on('click', function () {
var dropzones = $(dropzoneSelector);
dropzones.each(createDropzone);
});
}
}

dropzones.each(createDropzone);
});
}
});