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

Fix trash-bin purge for ocis-storage #1399

Merged
merged 1 commit into from
Jan 19, 2021
Merged

Conversation

IljaN
Copy link
Member

@IljaN IljaN commented Jan 14, 2021

@update-docs
Copy link

update-docs bot commented Jan 14, 2021

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@IljaN IljaN marked this pull request as ready for review January 14, 2021 14:20
@IljaN IljaN requested a review from labkode as a code owner January 14, 2021 14:20
@IljaN IljaN requested a review from butonic January 14, 2021 14:21
@IljaN IljaN changed the title Fix trash-bin purge Fix trash-bin purge for ocis-storage Jan 14, 2021
@IljaN IljaN self-assigned this Jan 14, 2021
@IljaN IljaN marked this pull request as draft January 14, 2021 16:41
@IljaN IljaN marked this pull request as ready for review January 18, 2021 11:12
@IljaN IljaN requested review from labkode and removed request for labkode January 18, 2021 15:35
@butonic
Copy link
Contributor

butonic commented Jan 18, 2021

@IljaN in Line 182 of

if getRecycleRes.Status.Code != rpc.Code_CODE_OK {
HandleErrorStatus(&sublog, w, getHomeRes.Status)
return
}
could you change getHomeRes.Status to getRecycleRes.Status stumbled over this ...

@butonic
Copy link
Contributor

butonic commented Jan 18, 2021

oh and bonuspoints if you recursively descend the nodes and actually delete all children when deleting a folder.

@IljaN
Copy link
Member Author

IljaN commented Jan 19, 2021

oh and bonuspoints if you recursively descend the nodes and actually delete all children when deleting a folder.

Yeah there is still one trashbin test failing, this is probably it.

@labkode labkode merged commit fcd6626 into cs3org:master Jan 19, 2021
@IljaN IljaN deleted the trashbin-purge-fix branch January 19, 2021 08:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants