diff options
| author | Anna Larch <anna@nextcloud.com> | 2021-12-06 20:01:22 +0100 |
|---|---|---|
| committer | Anna Larch <anna@nextcloud.com> | 2022-03-16 12:48:50 +0100 |
| commit | 0745fc50126e92406ec95265ef1ff5d4b5575d3e (patch) | |
| tree | 452e44b917c0d242669ee93d58fc84d5210802e5 /apps/dav/lib/RootCollection.php | |
| parent | a626307da8e9a4e5124da1c35429892f745b2de9 (diff) | |
| download | nextcloud-server-0745fc50126e92406ec95265ef1ff5d4b5575d3e.tar.gz nextcloud-server-0745fc50126e92406ec95265ef1ff5d4b5575d3e.zip | |
Move calendar objects between calendars instead of deleting and recreating them
Signed-off-by: Anna Larch <anna@nextcloud.com>
Diffstat (limited to 'apps/dav/lib/RootCollection.php')
| -rw-r--r-- | apps/dav/lib/RootCollection.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/dav/lib/RootCollection.php b/apps/dav/lib/RootCollection.php index d307b5d2488..2e5952f6efd 100644 --- a/apps/dav/lib/RootCollection.php +++ b/apps/dav/lib/RootCollection.php @@ -47,6 +47,7 @@ use OCP\App\IAppManager; use OCP\AppFramework\Utility\ITimeFactory; use OCP\EventDispatcher\IEventDispatcher; use OCP\IConfig; +use Psr\Log\LoggerInterface; use Sabre\DAV\SimpleCollection; class RootCollection extends SimpleCollection { @@ -54,6 +55,7 @@ class RootCollection extends SimpleCollection { $l10n = \OC::$server->getL10N('dav'); $random = \OC::$server->getSecureRandom(); $logger = \OC::$server->getLogger(); + $psrLogger = \OC::$server->get(LoggerInterface::class); $userManager = \OC::$server->getUserManager(); $userSession = \OC::$server->getUserSession(); $groupManager = \OC::$server->getGroupManager(); @@ -107,15 +109,15 @@ class RootCollection extends SimpleCollection { $legacyDispatcher, $config ); - $userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users'); + $userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users', $psrLogger); $userCalendarRoot->disableListing = $disableListing; - $resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources'); + $resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources', $psrLogger); $resourceCalendarRoot->disableListing = $disableListing; - $roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $caldavBackend, 'principals/calendar-rooms'); + $roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $caldavBackend, 'principals/calendar-rooms', $psrLogger); $roomCalendarRoot->disableListing = $disableListing; - $publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config); + $publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config, $psrLogger); $publicCalendarRoot->disableListing = $disableListing; $systemTagCollection = new SystemTag\SystemTagsByIdCollection( |