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] Backport of Remove share permission check from the file up… #35082

Merged

Conversation

sharidas
Copy link
Contributor

…load

Remove share permission check from the file upload
js file.

Signed-off-by: Sujith H sharidasan@owncloud.com

Description

Remove sharePermission checks from the file-upload.js. We are no where using it and there is a problem in the code due to this. When we know its a file, we just have to check the fileinfo ( in the if condition ). The problem this PR tries to address is, when files are uploaded, the file information should be shown. Instead of this, the directory information was shown.

This also fixes the cancel button problem in the conflict dialog. The cancel button clicked once cancels the conflict dialog.

Related Issue

Motivation and Context

Remove sharePermission checks from the file-upload.js file. This solves 2 problems:

  1. The file which has conflict will show the file information in the conflict dialog popup and not the directory info.
  2. Cancel button of the conflict dialog pop up will work with one click, instead of multiple click issue mentioned at conflict dialogue for "Download / View / Upload" public link multiplies the confict files on "cancel" #35057.

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • Backport (if applicable set "backport-request" label and remove when the backport was done)

…load

Remove share permission check from the file upload
js file.

Signed-off-by: Sujith H <sharidasan@owncloud.com>
@sharidas sharidas added this to the development milestone Apr 23, 2019
@sharidas sharidas self-assigned this Apr 23, 2019
@sharidas
Copy link
Contributor Author

Original PR #35060

Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍

@PVince81 PVince81 changed the title [stable10] Backport of Remove share permission check from the file up… [10.2.0] Backport of Remove share permission check from the file up… Apr 23, 2019
@PVince81 PVince81 modified the milestones: development, QA Apr 23, 2019
@codecov
Copy link

codecov bot commented Apr 23, 2019

Codecov Report

Merging #35082 into release-10.2.0 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.2.0   #35082   +/-   ##
=================================================
  Coverage             64.29%   64.29%           
  Complexity            20040    20040           
=================================================
  Files                  1285     1285           
  Lines                 76824    76824           
  Branches               1307     1307           
=================================================
  Hits                  49394    49394           
  Misses                27049    27049           
  Partials                381      381
Flag Coverage Δ Complexity Δ
#javascript 53.01% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.49% <ø> (ø) 20040 <ø> (ø) ⬇️

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 4a80725...7c80bcb. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Apr 23, 2019

Codecov Report

Merging #35082 into release-10.2.0 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.2.0   #35082   +/-   ##
=================================================
  Coverage             64.29%   64.29%           
  Complexity            20040    20040           
=================================================
  Files                  1285     1285           
  Lines                 76824    76824           
  Branches               1307     1307           
=================================================
  Hits                  49394    49394           
  Misses                27049    27049           
  Partials                381      381
Flag Coverage Δ Complexity Δ
#javascript 53.01% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.49% <ø> (ø) 20040 <ø> (ø) ⬇️

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 4a80725...7c80bcb. Read the comment docs.

@PVince81 PVince81 merged commit f7a4610 into release-10.2.0 Apr 23, 2019
@delete-merged-branch delete-merged-branch bot deleted the remove-sharepermission-check-release-10.2.0 branch April 23, 2019 11:52
@lock lock bot locked as resolved and limited conversation to collaborators Apr 25, 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.

2 participants