Skip to content

Commit cf319ae

Browse files
committed
fix(caldav): use direct.edit route in event activities
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
1 parent 14868ac commit cf319ae

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

apps/dav/lib/CalDAV/Activity/Provider/Event.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,9 @@ protected function generateObjectParameter(array $eventData, string $affectedUse
7878
// as seen from the affected user.
7979
$objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $affectedUser . '/' . $calendarUri . '_shared_by_' . $linkData['owner'] . '/' . $linkData['object_uri']);
8080
}
81-
$link = [
82-
'view' => 'dayGridMonth',
83-
'timeRange' => 'now',
84-
'mode' => 'sidebar',
81+
$params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexdirect.edit', [
8582
'objectId' => $objectId,
86-
'recurrenceId' => 'next'
87-
];
88-
$params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexview.timerange.edit', $link);
83+
]);
8984
} catch (\Exception $error) {
9085
// Do nothing
9186
}

apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,7 @@ public function testGenerateObjectParameter(int $id, string $name, ?array $link,
9595
if ($link) {
9696
$affectedUser = $link['owner'];
9797
$generatedLink = [
98-
'view' => 'dayGridMonth',
99-
'timeRange' => 'now',
100-
'mode' => 'sidebar',
10198
'objectId' => base64_encode('/remote.php/dav/calendars/' . $link['owner'] . '/' . $link['calendar_uri'] . '/' . $link['object_uri']),
102-
'recurrenceId' => 'next'
10399
];
104100
$this->appManager->expects($this->once())
105101
->method('isEnabledForUser')
@@ -110,7 +106,7 @@ public function testGenerateObjectParameter(int $id, string $name, ?array $link,
110106
->method('getWebroot');
111107
$this->url->expects($this->once())
112108
->method('linkToRouteAbsolute')
113-
->with('calendar.view.indexview.timerange.edit', $generatedLink)
109+
->with('calendar.view.indexdirect.edit', $generatedLink)
114110
->willReturn('fullLink');
115111
}
116112
}
@@ -177,11 +173,7 @@ public static function generateObjectParameterLinkEncodingDataProvider(): array
177173
/** @dataProvider generateObjectParameterLinkEncodingDataProvider */
178174
public function testGenerateObjectParameterLinkEncoding(array $link, string $objectId): void {
179175
$generatedLink = [
180-
'view' => 'dayGridMonth',
181-
'timeRange' => 'now',
182-
'mode' => 'sidebar',
183176
'objectId' => $objectId,
184-
'recurrenceId' => 'next'
185177
];
186178
$this->appManager->expects($this->once())
187179
->method('isEnabledForUser')
@@ -191,7 +183,7 @@ public function testGenerateObjectParameterLinkEncoding(array $link, string $obj
191183
->method('getWebroot');
192184
$this->url->expects($this->once())
193185
->method('linkToRouteAbsolute')
194-
->with('calendar.view.indexview.timerange.edit', $generatedLink)
186+
->with('calendar.view.indexdirect.edit', $generatedLink)
195187
->willReturn('fullLink');
196188
$objectParameter = ['id' => 42, 'name' => 'calendar', 'link' => $link];
197189
$result = [

0 commit comments

Comments
 (0)