sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1130 from nextcloud/shared-upload-quota 

[uc] Fix uploading to shared folder with quota
pull/1172/head
Roeland Jago Douma 2016-08-29 20:37:07 +07:00 committed by GitHub
parent e1ea45f32b 6c365cb06d
commit 4f93dce2e1
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/files_sharing/lib/sharedstorage.php
Unescape Escape View File

@ -105,6 +105,16 @@ class Shared extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage {
}
}
/**
* @inheritdoc
*/
public function instanceOfStorage($class) {
if (in_array($class, ['\OC\Files\Storage\Home', '\OC\Files\ObjectStore\HomeObjectStoreStorage'])) {
return false;
}
return parent::instanceOfStorage($class);
}
/**
* @return string
*/

18
build/integration/features/webdav-related.feature
Unescape Escape View File

@ -59,6 +59,24 @@ Feature: webdav-related
|{DAV:}quota-available-bytes|
And the single response should contain a property "{DAV:}quota-available-bytes" with value "10485421"
Scenario: Uploading a file as recipient using webdav having quota
Given using dav path "remote.php/webdav"
And As an "admin"
And user "user0" exists
And user "user1" exists
And user "user0" has a quota of "10 MB"
And user "user1" has a quota of "10 MB"
And As an "user1"
And user "user1" created a folder "/testquota"
And as "user1" creating a share with
| path | testquota |
| shareType | 0 |
| permissions | 31 |
| shareWith | user0 |
And As an "user0"
When User "user0" uploads file "data/textfile.txt" to "/testquota/asdf.txt"
Then the HTTP status code should be "201"
Scenario: download a public shared file with range
Given user "user0" exists
And As an "user0"