mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix principal collection for CavDAVTester

This commit is contained in:
Thomas Müller 2015-11-25 17:15:40 +01:00
parent b799e42b4e
commit cc8c38e8ba
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dav/lib/rootcollection.php
View File

@ -28,12 +28,12 @@ class RootCollection extends SimpleCollection {
$filesCollection = new Files\RootCollection($principalBackend, 'principals/users'); $filesCollection = new Files\RootCollection($principalBackend, 'principals/users');
$filesCollection->disableListing = $disableListing; $filesCollection->disableListing = $disableListing;
$caldavBackend = new CalDavBackend($db); $caldavBackend = new CalDavBackend($db);
$calendarRoot = new CalendarRoot($principalBackend, $caldavBackend); $calendarRoot = new CalendarRoot($principalBackend, $caldavBackend, 'principals/users');
$calendarRoot->disableListing = $disableListing; $calendarRoot->disableListing = $disableListing;
$cardDavBackend = new CardDavBackend(\OC::$server->getDatabaseConnection(), $principalBackend); $cardDavBackend = new CardDavBackend(\OC::$server->getDatabaseConnection(), $principalBackend);
$addressBookRoot = new AddressBookRoot($principalBackend, $cardDavBackend); $addressBookRoot = new AddressBookRoot($principalBackend, $cardDavBackend, 'principals/users');
$addressBookRoot->disableListing = $disableListing; $addressBookRoot->disableListing = $disableListing;
$children = [ $children = [

2
apps/dav/tests/travis/caldavtest/config/serverinfo.xml
View File

@ -180,7 +180,7 @@
<!-- relative path to main principal collection--> <!-- relative path to main principal collection-->
<substitution> <substitution>
<key>$principalcollection:</key> <key>$principalcollection:</key>
<value>$root:principals/</value> <value>$root:principals/users/</value>
</substitution> </substitution>
<!-- the core recored type collections--> <!-- the core recored type collections-->