Skip to content

IQSS/8730 - fix direct upload progress #8962

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
kcondon merged 4 commits into from
Dec 16, 2022
Merged

IQSS/8730 - fix direct upload progress #8962

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
727ef9b
fix progress during hash calc
qqmyers Sep 7, 2022
d29fdff
Merge remote-tracking branch 'IQSS/develop' into IQSS/8730-fix_progre…
qqmyers Oct 5, 2022
ff21e5a
Merge remote-tracking branch 'IQSS/develop' into IQSS/8730-fix_progre…
qqmyers Nov 7, 2022
fb8f528
Merge remote-tracking branch 'IQSS/develop' into IQSS/8730-fix_progre…
qqmyers Dec 14, 2022
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
3 changes: 2 additions & 1 deletion src/main/webapp/resources/js/fileupload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ var fileUpload = class fileUploadClass {
async doUpload() {
this.state = UploadState.UPLOADING;
var thisFile = curFile-1;
this.id=thisFile;
//This appears to be the earliest point when the file table has been populated, and, since we don't know how many table entries have had ids added already, we check
var filerows = $('.ui-fileupload-files .ui-fileupload-row');
//Add an id attribute to each entry so we can later match progress and errors with the right entry
Expand Down Expand Up @@ -318,7 +319,7 @@ var fileUpload = class fileUploadClass {
if (directUploadReport) {
getMD5(this.file, prog => {
var current = 1 + prog;
$('progress').attr({
$('[upid="' + this.id + '"] progress').attr({
value: current,
max: 2
});
Expand Down