-
Notifications
You must be signed in to change notification settings - Fork 28
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.
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
Add MultipleFileField to handle and clean multiple files #465
Merged
Merged
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
fb473b5
Add MultipleFileField to handle and clean multiple files
will-moore bf80b25
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 1968045
Bump requirement to Django>=3.2.19
will-moore 593172a
Merge remote-tracking branch 'origin/master' into MultipleFileField
will-moore f2793a1
Move MultipleFileField to custom_forms.py
will-moore c76f377
Flake8 fix
will-moore File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -62,6 +62,28 @@ | |
) % help_button | ||
|
||
|
||
################################################################# | ||
# Custom widget and validation for multiple file uploads | ||
|
||
|
||
class MultipleFileInput(forms.ClearableFileInput): | ||
allow_multiple_selected = True | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Might be worth adding a comment and/or a reference to the documentation explaining why we are subclassing these Django classes. |
||
|
||
|
||
class MultipleFileField(forms.FileField): | ||
def __init__(self, *args, **kwargs): | ||
kwargs.setdefault("widget", MultipleFileInput()) | ||
super().__init__(*args, **kwargs) | ||
|
||
def clean(self, data, initial=None): | ||
single_file_clean = super().clean | ||
if isinstance(data, (list, tuple)): | ||
result = [single_file_clean(d, initial) for d in data] | ||
else: | ||
result = single_file_clean(data, initial) | ||
return result | ||
|
||
|
||
################################################################# | ||
# Non-model Form | ||
|
||
|
@@ -334,9 +356,7 @@ def __init__(self, *args, **kwargs): | |
required=False, | ||
) | ||
|
||
annotation_file = forms.FileField( | ||
widget=forms.ClearableFileInput(attrs={"multiple": True}), required=False | ||
) | ||
annotation_file = MultipleFileField(required=False) | ||
|
||
|
||
class CommentAnnotationForm(BaseAnnotationForm): | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Having looked at how the code is organized, all custom widget/fields are declared
omeroweb.webclient.custom_forms
and imported here to construct the webclient forms.