Skip to content

Disable uploading files while an upload is in progress #2237

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

Merged
pomegranited merged 1 commit into from
Jul 3, 2025
Merged

Disable uploading files while an upload is in progress #2237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion openassessment/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Initialization Information for Open Assessment Module
"""

__version__ = '6.16.3'
__version__ = '6.16.4'
1 change: 1 addition & 0 deletions openassessment/templates/legacy/response/oa_response.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ <h5 class="message__title">{% trans "We could not delete files" %}</h5>
</div>
<input type="file" class="submission__answer__upload file--upload" id="submission_answer_upload_{{ xblock_id }}" {% if allow_multiple_files %}multiple=""{% endif %} accept="{{white_listed_file_types|join:", "}}">
<button type="submit" class="file__upload action action--upload">
<span class="icon fa fa-spinner fa-spin is--hidden" aria-hidden="true"></span>

@pomegranited pomegranited Jun 29, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is working great, but the is--hidden style isn't working so well, so the spinner is causing the button text to be off center:

image

Could you update %state-hidden to make display: none !important;?

@viadanna viadanna Jul 2, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure @pomegranited done 👍

{% if allow_multiple_files %}
{% trans "Upload files" %}
{% else %}
Expand Down
Binary file renamed ...dist/1b90ce76fe01a1aa6e5ec289a5fb3799.png → ...dist/4620b30a966533ace489dcc7afb151b9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 15 additions & 15 deletions openassessment/xblock/static/dist/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
"openassessment-editor-textarea.js.map": "/openassessment-editor-textarea.cbb31e4372be87d437fb.js.map",
"openassessment-editor-tinymce.js": "/openassessment-editor-tinymce.2a1e66e98a2a1132f633.js",
"openassessment-editor-tinymce.js.map": "/openassessment-editor-tinymce.2a1e66e98a2a1132f633.js.map",
"openassessment-lms.css": "/openassessment-lms.51b88d7de00c69ab0a2e.css",
"openassessment-lms.js": "/openassessment-lms.51b88d7de00c69ab0a2e.js",
"openassessment-lms.css.map": "/openassessment-lms.51b88d7de00c69ab0a2e.css.map",
"openassessment-lms.js.map": "/openassessment-lms.51b88d7de00c69ab0a2e.js.map",
"openassessment-ltr.css": "/openassessment-ltr.2c55d39b6a9784df6e13.css",
"openassessment-ltr.js": "/openassessment-ltr.2c55d39b6a9784df6e13.js",
"openassessment-ltr.css.map": "/openassessment-ltr.2c55d39b6a9784df6e13.css.map",
"openassessment-ltr.js.map": "/openassessment-ltr.2c55d39b6a9784df6e13.js.map",
"openassessment-rtl.css": "/openassessment-rtl.86c76a295df3b3a8f88c.css",
"openassessment-rtl.js": "/openassessment-rtl.86c76a295df3b3a8f88c.js",
"openassessment-rtl.css.map": "/openassessment-rtl.86c76a295df3b3a8f88c.css.map",
"openassessment-rtl.js.map": "/openassessment-rtl.86c76a295df3b3a8f88c.js.map",
"openassessment-studio.js": "/openassessment-studio.65076e7e76039d8c8ab2.js",
"openassessment-studio.js.map": "/openassessment-studio.65076e7e76039d8c8ab2.js.map",
"fallback-default.png": "/1b90ce76fe01a1aa6e5ec289a5fb3799.png",
"openassessment-lms.css": "/openassessment-lms.42bdf01af5d117224bc9.css",
"openassessment-lms.js": "/openassessment-lms.42bdf01af5d117224bc9.js",
"openassessment-lms.css.map": "/openassessment-lms.42bdf01af5d117224bc9.css.map",
"openassessment-lms.js.map": "/openassessment-lms.42bdf01af5d117224bc9.js.map",
"openassessment-ltr.css": "/openassessment-ltr.0c6318822d5661f0f9ea.css",
"openassessment-ltr.js": "/openassessment-ltr.0c6318822d5661f0f9ea.js",
"openassessment-ltr.css.map": "/openassessment-ltr.0c6318822d5661f0f9ea.css.map",
"openassessment-ltr.js.map": "/openassessment-ltr.0c6318822d5661f0f9ea.js.map",
"openassessment-rtl.css": "/openassessment-rtl.c938e1614108d8feb891.css",
"openassessment-rtl.js": "/openassessment-rtl.c938e1614108d8feb891.js",
"openassessment-rtl.css.map": "/openassessment-rtl.c938e1614108d8feb891.css.map",
"openassessment-rtl.js.map": "/openassessment-rtl.c938e1614108d8feb891.js.map",
"openassessment-studio.js": "/openassessment-studio.b58bb4e55f63dadac6de.js",
"openassessment-studio.js.map": "/openassessment-studio.b58bb4e55f63dadac6de.js.map",
"fallback-default.png": "/4620b30a966533ace489dcc7afb151b9.png",
"default-avatar.svg": "/95ec738c0b7faac5b5c9126794446bbd.svg"
}
3 changes: 3 additions & 0 deletions openassessment/xblock/static/dist/openassessment-lms.42bdf01af5d117224bc9.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 17 additions & 17 deletions ...penassessment-lms.51b88d7de00c69ab0a2e.js → ...penassessment-lms.42bdf01af5d117224bc9.js
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions openassessment/xblock/static/dist/openassessment-lms.51b88d7de00c69ab0a2e.css
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...enassessment-ltr.2c55d39b6a9784df6e13.css → ...enassessment-ltr.0c6318822d5661f0f9ea.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...penassessment-ltr.2c55d39b6a9784df6e13.js → ...penassessment-ltr.0c6318822d5661f0f9ea.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...enassessment-rtl.86c76a295df3b3a8f88c.css → ...enassessment-rtl.c938e1614108d8feb891.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...penassessment-rtl.86c76a295df3b3a8f88c.js → ...penassessment-rtl.c938e1614108d8feb891.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...assessment-studio.65076e7e76039d8c8ab2.js → ...assessment-studio.b58bb4e55f63dadac6de.js
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 13 additions & 2 deletions openassessment/xblock/static/js/src/lms/oa_response.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,25 @@ export class ResponseView {
// Install click handler for the preview button
this.baseView.bindLatexPreview(sel);

const uploadButton = sel.find('.file__upload');
const spinner = sel.find('.fa-spinner');
// Install a click handler for the save button
sel.find('.file__upload').click(
uploadButton.click(
(eventObject) => {
// Override default form submission
eventObject.preventDefault();
$('.submission__answer__display__file', view.element).removeClass('is--hidden');
uploadButton.prop('disabled', true);
spinner.removeClass('is--hidden');
if (view.hasAllUploadFiles()) {
view.uploadFiles();
const promise = view.uploadFiles();
promise.then(() => {
uploadButton.prop('disabled', false);
spinner.addClass('is--hidden');
});
} else {
uploadButton.prop('disabled', false);
spinner.addClass('is--hidden');
}
},
);
Expand Down
2 changes: 1 addition & 1 deletion openassessment/xblock/static/sass/xb/utilities/_extends.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
// --------------------
%state-hidden {
@extend %state-disabled;
display: none;
display: none !important;
visibility: hidden;
}

Expand Down