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.

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

[10.2.0] Fix missing progress bar in files drop view #35059

Merged
merged 1 commit into from
Apr 18, 2019

Conversation

PVince81
Copy link
Contributor

backport of #35032 for 10.2

The uploader is expecting the progress bar element to be in the DOM when
created. This fix makes sure to append the PublicUploadView's element to
the DOM before rendering it.
@PVince81 PVince81 added this to the QA milestone Apr 18, 2019
@PVince81 PVince81 requested a review from sharidas April 18, 2019 07:27
@PVince81 PVince81 self-assigned this Apr 18, 2019
Copy link
Contributor

@sharidas sharidas left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@codecov
Copy link

codecov bot commented Apr 18, 2019

Codecov Report

Merging #35059 into release-10.2.0 will increase coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.2.0   #35059      +/-   ##
====================================================
+ Coverage             64.29%   64.29%   +<.01%     
  Complexity            20040    20040              
====================================================
  Files                  1285     1285              
  Lines                 76824    76824              
  Branches               1307     1307              
====================================================
+ Hits                  49393    49394       +1     
+ Misses                27050    27049       -1     
  Partials                381      381
Flag Coverage Δ Complexity Δ
#javascript 53.01% <0%> (ø) 0 <0> (ø) ⬇️
#phpunit 65.49% <ø> (ø) 20040 <ø> (ø) ⬇️
Impacted Files Coverage Δ Complexity Δ
apps/files_sharing/js/PublicUploadView.js 67.39% <0%> (ø) 0 <0> (ø) ⬇️
lib/private/Server.php 86.66% <0%> (+0.11%) 253% <0%> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1c7b738...678a402. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Apr 18, 2019

Codecov Report

Merging #35059 into release-10.2.0 will increase coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.2.0   #35059      +/-   ##
====================================================
+ Coverage             64.29%   64.29%   +<.01%     
  Complexity            20040    20040              
====================================================
  Files                  1285     1285              
  Lines                 76824    76824              
  Branches               1307     1307              
====================================================
+ Hits                  49393    49394       +1     
+ Misses                27050    27049       -1     
  Partials                381      381
Flag Coverage Δ Complexity Δ
#javascript 53.01% <0%> (ø) 0 <0> (ø) ⬇️
#phpunit 65.49% <ø> (ø) 20040 <ø> (ø) ⬇️
Impacted Files Coverage Δ Complexity Δ
apps/files_sharing/js/PublicUploadView.js 67.39% <0%> (ø) 0 <0> (ø) ⬇️
lib/private/Server.php 86.66% <0%> (+0.11%) 253% <0%> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1c7b738...678a402. Read the comment docs.

@phil-davis
Copy link
Contributor

Looks good. Are we also doing a "normal" backport into stable10 like with other ongoing PR work?
(so that stable10 has a consistent view of the future from day-to-day)

@PVince81
Copy link
Contributor Author

@phil-davis not sure if backport to stable10 needed, we'll merge 10.2.0 to stable10 at the end of the release

@PVince81 PVince81 merged commit 8635818 into release-10.2.0 Apr 18, 2019
@delete-merged-branch delete-merged-branch bot deleted the release-10.2.0-fix-file-drop-progress branch April 18, 2019 09:18
@lock lock bot locked as resolved and limited conversation to collaborators Apr 18, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants