UPschooling/Nextcloud-App
4
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix merge conflict

Browse source
This commit is contained in:
Caluera 2021-10-10 19:21:39 +02:00
parent b6f3ca6b14
commit f13c054aef
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Service/TicketService.php
View file

@ -106,11 +106,7 @@ class TicketService {
$title = array_get($matrixTicketContent, "title", "Untitled"); $title = array_get($matrixTicketContent, "title", "Untitled");
$description = array_get($matrixTicketContent, "description", ""); $description = array_get($matrixTicketContent, "description", "");
$lastModified = $this->matrix->getLastEventDate($ticket->getMatrixRoom()); $lastModified = $this->matrix->getLastEventDate($ticket->getMatrixRoom());
<<<<<<< HEAD $matrixHelperUser = array_get($matrixTicketContent, "matrixHelperUser", "nicht zugewiesen");
$matrixHelperUser = array_get($matrixTicketContent, "matrixHelperUser", "nicht zugewiesen");
=======
$matrixHelperUserName = array_get($matrixTicketContent, "matrixHelperUserName", "nicht zugewiesen");
>>>>>>> ae0ffa811f99d5ee49597ff70a01aed705377b0c
$expirationDate = array_get($matrixTicketContent, "expiration date", ""); $expirationDate = array_get($matrixTicketContent, "expiration date", "");
return array( return array(
'ticketId' => $ticketId, 'ticketId' => $ticketId,
@ -118,11 +114,7 @@ class TicketService {
'lastModified' => $lastModified, 'lastModified' => $lastModified,
'title' => $title, 'title' => $title,
'description' => $description, 'description' => $description,
<<<<<<< HEAD
'matrixHelperUser' => $matrixHelperUser, 'matrixHelperUser' => $matrixHelperUser,
=======
'matrixHelferName' => $matrixHelperUserName,
>>>>>>> ae0ffa811f99d5ee49597ff70a01aed705377b0c
'expirationDate' => $expirationDate 'expirationDate' => $expirationDate
); );
} catch (MatrixException | RoomNotFoundException $e) { } catch (MatrixException | RoomNotFoundException $e) {