upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #40403 from nextcloud/backport/40301/stable26

Browse source
This commit is contained in:
Daniel 2023-09-18 18:19:09 +02:00 committed by GitHub
commit 08e2fa0258
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/dav/lib/CalDAV/Activity/Provider/Event.php
View file

@ -97,7 +97,7 @@ class Event extends Base {
// The calendar app needs to be manually loaded for the routes to be loaded // The calendar app needs to be manually loaded for the routes to be loaded
OC_App::loadApp('calendar'); OC_App::loadApp('calendar');
$linkData = $eventData['link']; $linkData = $eventData['link'];
$objectId = base64_encode('/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']); $objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']);
$link = [ $link = [
'view' => 'dayGridMonth', 'view' => 'dayGridMonth',
'timeRange' => 'now', 'timeRange' => 'now',

2
apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php
View file

@ -121,6 +121,8 @@ class EventTest extends TestCase {
->with('calendar') ->with('calendar')
->willReturn($calendarAppEnabled); ->willReturn($calendarAppEnabled);
if ($calendarAppEnabled) { if ($calendarAppEnabled) {
$this->url->expects($this->once())
->method('getWebroot');
$this->url->expects($this->once()) $this->url->expects($this->once())
->method('linkToRouteAbsolute') ->method('linkToRouteAbsolute')
->with('calendar.view.indexview.timerange.edit', $generatedLink) ->with('calendar.view.indexview.timerange.edit', $generatedLink)