]> source.dussan.org Git - nextcloud-server.git/commitdiff
Remove comment and guests option from Invitations UI 35761/head
authorAnna Larch <anna@nextcloud.com>
Tue, 13 Dec 2022 21:04:44 +0000 (22:04 +0100)
committerVincent Petry (Rebase PR Action) <PVince81@users.noreply.github.com>
Tue, 20 Dec 2022 16:31:06 +0000 (16:31 +0000)
Signed-off-by: Anna Larch <anna@nextcloud.com>
apps/dav/lib/Controller/InvitationResponseController.php
apps/dav/templates/schedule-response-options.php
apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php

index de22e3ba6a9e684fa6f6cb698c0b73cbdd16e57e..a360794987413cdddcf4a7454194fc1501c9a733 100644 (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;
index fe12ea96c79ec854a1ae5aeb63626040f9abe90a..bae43022f12fc7fe05e4954f9fef2234e670e669 100644 (file)
                                </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>
index fdbb69e6c0d33ebbce5a262cb64cc98f0f80d48f..06d68ca5360f56ac35b35617cbf0f61ebc3f8938 100644 (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