X Tutup
Skip to content

Keep DAV properties when file goes to trashbin#35954

Merged
micbar merged 2 commits intomasterfrom
keep-props-for-trashbin
Aug 2, 2019
Merged

Keep DAV properties when file goes to trashbin#35954
micbar merged 2 commits intomasterfrom
keep-props-for-trashbin

Conversation

@VicDeo
Copy link
Member

@VicDeo VicDeo commented Jul 30, 2019 •
edited
Loading

Description

Do not delete dav properties when the file is found in the trashbin

Related Issue

Motivation and Context

Props are cleaned, files are kept

How Has This Been Tested?

  1. Enable trashbin
  2. Upload a file
  3. Add a custom property into oc_properties table for it's fileId
  4. Put the file into trashbin and restore

Expected

Property is kept

Actual

Property is deleted

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:

TODO

  • deletion from trashbin doesn't go through dav, so when the file is finally deleted it's properties remain

@VicDeo VicDeo added this to the development milestone Jul 30, 2019
@VicDeo VicDeo self-assigned this Jul 30, 2019
@VicDeo VicDeo changed the title Keep properties when file goes to trashbin Keep DAV properties when file goes to trashbin Jul 30, 2019
@VicDeo VicDeo force-pushed the keep-props-for-trashbin branch 2 times, most recently from a12f45d to b806f39 Compare July 30, 2019 19:48
@codecov
Copy link

codecov bot commented Jul 30, 2019 •
edited
Loading

Codecov Report

Merging #35954 into master will increase coverage by <.01%.
The diff coverage is 63.63%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #35954      +/-   ##
============================================
+ Coverage      65.4%    65.4%   +<.01%     
- Complexity    20197    20199       +2     
============================================
  Files          1299     1299              
  Lines         76762    76770       +8     
  Branches       1301     1301              
============================================
+ Hits          50203    50209       +6     
- Misses        26174    26176       +2     
  Partials        385      385
Flag Coverage Δ Complexity Δ
#javascript 53.85% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 66.62% <63.63%> (ø) 20199 <0> (+2) ⬆️
Impacted Files Coverage Δ Complexity Δ
apps/dav/lib/Server.php 52.7% <0%> (-0.73%) 24 <0> (ø)
apps/dav/lib/Connector/Sabre/ServerFactory.php 95.94% <100%> (+0.05%) 10 <0> (ø) ⬇️
...ps/dav/lib/DAV/AbstractCustomPropertiesBackend.php 98.24% <100%> (+0.03%) 19 <0> (ø) ⬇️
apps/dav/lib/DAV/FileCustomPropertiesBackend.php 89.32% <100%> (+0.43%) 33 <0> (+2) ⬆️

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 4e2d11f...cefaf10. Read the comment docs.

@VicDeo VicDeo force-pushed the keep-props-for-trashbin branch from b806f39 to a0664b7 Compare July 31, 2019 12:14
@VicDeo
Copy link
Member Author

VicDeo commented Jul 31, 2019 •
edited
Loading

mhm. daily-stable10-qa.tar.bz2?
https://drone.owncloud.com/owncloud/core/19882/400
https://drone.owncloud.com/owncloud/core/19882/404
https://drone.owncloud.com/owncloud/core/19882/852
https://drone.owncloud.com/owncloud/core/19882/910

@VicDeo
Copy link
Member Author

VicDeo commented Jul 31, 2019

@phil-davis any idea why the current master tip still uses daily-stable10-qa.tar.bz2 for the federated server?

@VicDeo VicDeo requested a review from micbar July 31, 2019 12:58
@phil-davis
Copy link
Contributor

phil-davis commented Jul 31, 2019 •
edited
Loading

@phil-davis any idea why the current master tip still uses daily-stable10-qa.tar.bz2 for the federated server?

Thanks for pointing this out. My idea is that it was missed - I raised PR #35964 to fixup various leftover stable10 references.

@VicDeo VicDeo force-pushed the keep-props-for-trashbin branch from a0664b7 to 05b9538 Compare July 31, 2019 21:19
micbar
micbar approved these changes Aug 1, 2019
View reviewed changes
Copy link
Contributor

@micbar micbar left a comment

Choose a reason for hiding this comment

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

👍

@micbar micbar merged commit c694bc8 into master Aug 2, 2019
@delete-merged-branch delete-merged-branch bot deleted the keep-props-for-trashbin branch August 2, 2019 07:46
@davitol davitol mentioned this pull request Sep 3, 2019
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@micbar micbar micbar approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@VicDeo VicDeo

Labels

3 - To Review

Projects

None yet

Milestone

development

Development

Successfully merging this pull request may close these issues.

4 participants

@VicDeo @phil-davis @micbar @patrickjahns
X Tutup