upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 23:03:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #35761 from nextcloud/fix/remove-guests-comments

Browse source 
Remove comment and guests option from Invitations UI
This commit is contained in:
Julius Härtl 2022-12-22 10:03:37 +01:00 committed by GitHub
commit 65a98f6349
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/dav/lib/Controller/InvitationResponseController.php
View file

@ -140,15 +140,13 @@ class InvitationResponseController extends Controller {
*/
public function processMoreOptionsResult(string $token):TemplateResponse {
$partstat = $this->request->getParam('partStat');
$guests = (int) $this->request->getParam('guests');
$comment = $this->request->getParam('comment');
$row = $this->getTokenInformation($token);
if (!$row || !\in_array($partstat, ['ACCEPTED', 'DECLINED', 'TENTATIVE'])) {
return new TemplateResponse($this->appName, 'schedule-response-error', [], 'guest');
}
$iTipMessage = $this->buildITipResponse($row, $partstat, $guests, $comment);
$iTipMessage = $this->buildITipResponse($row, $partstat);
$this->responseServer->handleITipMessage($iTipMessage);
if ($iTipMessage->getScheduleStatus() === '1.2') {
return new TemplateResponse($this->appName, 'schedule-response-success', [], 'guest');
@ -190,8 +188,7 @@ class InvitationResponseController extends Controller {
* @param string|null $comment
* @return Message
*/
private function buildITipResponse(array $row, string $partStat, int $guests = null,
string $comment = null):Message {
private function buildITipResponse(array $row, string $partStat):Message {
$iTipMessage = new Message();
$iTipMessage->uid = $row['uid'];
$iTipMessage->component = 'VEVENT';
@ -225,19 +222,7 @@ EOF;
$row['uid'], $row['sequence'] ?? 0, $row['recurrenceid'] ?? ''
]));
$vEvent = $vObject->{'VEVENT'};
/** @var \Sabre\VObject\Property\ICalendar\CalAddress $attendee */
$attendee = $vEvent->{'ATTENDEE'};
$vEvent->DTSTAMP = date('Ymd\\THis\\Z', $this->timeFactory->getTime());
if ($comment) {
$attendee->add('X-RESPONSE-COMMENT', $comment);
$vEvent->add('COMMENT', $comment);
}
if ($guests) {
$attendee->add('X-NUM-GUESTS', $guests);
}
$iTipMessage->message = $vObject;
return $iTipMessage;

4
apps/dav/templates/schedule-response-options.php
View file

@ -25,10 +25,6 @@
</label>
</div>
</fieldset>
<fieldset id="more_options">
<input type="number" min="0" name="guests" placeholder="<?php p($l->t('Number of guests')); ?>" />
<input type="text" name="comment" placeholder="<?php p($l->t('Comment')); ?>" />
</fieldset>
<fieldset>
<input type="submit" value="<?php p($l->t('Save'));?>">
</fieldset>

14
apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
View file

@ -379,18 +379,10 @@ EOF;
* @dataProvider attendeeProvider
*/
public function testProcessMoreOptionsResult(bool $isExternalAttendee): void {
$this->request->expects($this->at(0))
$this->request->expects($this->once())
->method('getParam')
->with('partStat')
->willReturn('TENTATIVE');
$this->request->expects($this->at(1))
->method('getParam')
->with('guests')
->willReturn('7');
$this->request->expects($this->at(2))
->method('getParam')
->with('comment')
->willReturn('Foo bar Bli blub');
$this->buildQueryExpects('TOKEN123', [
'id' => 0,
@ -409,14 +401,12 @@ VERSION:2.0
PRODID:-//Nextcloud/Nextcloud CalDAV Server//EN
METHOD:REPLY
BEGIN:VEVENT
ATTENDEE;PARTSTAT=TENTATIVE;X-RESPONSE-COMMENT=Foo bar Bli blub;X-NUM-GUEST
S=7:mailto:attendee@foo.bar
ATTENDEE;PARTSTAT=TENTATIVE:mailto:attendee@foo.bar
ORGANIZER:mailto:organizer@foo.bar
UID:this-is-the-events-uid
SEQUENCE:0
REQUEST-STATUS:2.0;Success
DTSTAMP:19700101T002217Z
COMMENT:Foo bar Bli blub
END:VEVENT
END:VCALENDAR