aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2016-03-03 19:47:35 +0100
committerRoeland Jago Douma <rullzer@owncloud.com>2016-03-03 20:03:06 +0100
commit3bdafc2122acede0ed4810768718ff9d2c947e64 (patch)
treea3404d09241ca556ed347b1ce0b92e47f8dc6598
parent8d2238e0559be894a4b836d3371dbdae5696e5eb (diff)
downloadnextcloud-server-3bdafc2122acede0ed4810768718ff9d2c947e64.tar.gz
nextcloud-server-3bdafc2122acede0ed4810768718ff9d2c947e64.zip
Rename and move permissions are set when a file is updatable
* Fix unit tests
-rw-r--r--apps/dav/lib/connector/sabre/node.php2
-rw-r--r--apps/dav/tests/unit/connector/sabre/node.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/dav/lib/connector/sabre/node.php b/apps/dav/lib/connector/sabre/node.php
index 41dcb421913..95a5f0a8749 100644
--- a/apps/dav/lib/connector/sabre/node.php
+++ b/apps/dav/lib/connector/sabre/node.php
@@ -230,7 +230,7 @@ abstract class Node implements \Sabre\DAV\INode {
if ($this->info->isDeletable()) {
$p .= 'D';
}
- if ($this->info->isDeletable()) {
+ if ($this->info->isUpdateable()) {
$p .= 'NV'; // Renameable, Moveable
}
if ($this->info->getType() === \OCP\Files\FileInfo::TYPE_FILE) {
diff --git a/apps/dav/tests/unit/connector/sabre/node.php b/apps/dav/tests/unit/connector/sabre/node.php
index dfbd95bfad8..8c92c2f063c 100644
--- a/apps/dav/tests/unit/connector/sabre/node.php
+++ b/apps/dav/tests/unit/connector/sabre/node.php
@@ -31,8 +31,8 @@ class Node extends \Test\TestCase {
array(\OCP\Constants::PERMISSION_ALL, 'file', true, false, 'SRDNVW'),
array(\OCP\Constants::PERMISSION_ALL, 'file', true, true, 'SRMDNVW'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_SHARE, 'file', true, false, 'SDNVW'),
- array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_UPDATE, 'file', false, false, 'RDNV'),
- array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_DELETE, 'file', false, false, 'RW'),
+ array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_UPDATE, 'file', false, false, 'RD'),
+ array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_DELETE, 'file', false, false, 'RNVW'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'file', false, false, 'RDNVW'),
array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'dir', false, false, 'RDNV'),
);