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 files node API failed rename/copy #3030

Merged
merged 3 commits into from
Jan 25, 2017
Merged

Conversation

icewind1991
Copy link
Member

Signed-off-by: Vincent Petry <pvince81@owncloud.com>
@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Jan 11, 2017
@icewind1991 icewind1991 added this to the Nextcloud 12.0 milestone Jan 11, 2017
@@ -1,7 +1,5 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
Copy link
Member

Choose a reason for hiding this comment

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

Ummm ... no 👎

Copy link
Member Author

@icewind1991 icewind1991 Jan 12, 2017

Choose a reason for hiding this comment

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

Misread the conflict resolution dialog when cherry picking, thought this was introduces in an older post-fork upstream commit

fixed now

@@ -1,7 +1,5 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
Copy link
Member

Choose a reason for hiding this comment

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

No 👎

Vincent Petry added 2 commits January 12, 2017 13:52
Whenever a rename or copy operation failed on the view, we must throw
an exception instead of just ignoring.

Signed-off-by: Vincent Petry <pvince81@owncloud.com>
Signed-off-by: Vincent Petry <pvince81@owncloud.com>
@icewind1991 icewind1991 force-pushed the filesapi-renamefailcase branch from 91a78f7 to 269b652 Compare January 12, 2017 12:53
@MorrisJobke MorrisJobke merged commit 95ab46e into master Jan 25, 2017
@MorrisJobke MorrisJobke deleted the filesapi-renamefailcase branch January 25, 2017 03:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants