kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-15 01:37:13 +00:00
Code Issues Projects Releases Wiki Activity

Display "Track date only"-chores as all-day also in iCal API endpoint (references #941)

Browse Source
This commit is contained in:
Bernd Bestel
2020-09-01 19:32:28 +02:00
parent 2bc3b53c63
commit 60f3d900e8
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/60_UNRELEASED_2020-xx-xx.md
View File

@@ -74,6 +74,7 @@
- Fixed that the endpoint `/objects/{entity}/{objectId}` always returned successfully, even when the given object not exists (now returns `404` when the object is not found) (thanks @fipwmaqzufheoxq92ebc) - Fixed that the endpoint `/objects/{entity}/{objectId}` always returned successfully, even when the given object not exists (now returns `404` when the object is not found) (thanks @fipwmaqzufheoxq92ebc)
- Fixed that the endpoint `/stock/volatile` didn't include products which expire today (thanks @fipwmaqzufheoxq92ebc) - Fixed that the endpoint `/stock/volatile` didn't include products which expire today (thanks @fipwmaqzufheoxq92ebc)
- Fixed that the endpoint `/objects/{entity}` did not include Userfields for Userentities (so the effective endpoint `/objects/userobjects`) - Fixed that the endpoint `/objects/{entity}` did not include Userfields for Userentities (so the effective endpoint `/objects/userobjects`)
- Endpoint `/calendar/ical`: Fixed that "Track date only"-chores were always set to happen at 12am (are treated as all-day events now)
- Fixed (again) that CORS was broken - Fixed (again) that CORS was broken
### General & other improvements/fixes ### General & other improvements/fixes

10
controllers/CalendarApiController.php
View File

@@ -22,12 +22,18 @@ class CalendarApiController extends BaseApiController
$date->setTime(23, 59, 59); $date->setTime(23, 59, 59);
} }
$description = '';
if (isset($event['description']))
{
$description = $event['description'];
}
$vEvent = new \Eluceo\iCal\Component\Event(); $vEvent = new \Eluceo\iCal\Component\Event();
$vEvent->setDtStart($date) $vEvent->setDtStart($date)
->setDtEnd($date) ->setDtEnd($date)
->setSummary($event['title']) ->setSummary($event['title'])
->setDescription($event['description']) ->setDescription($description)
->setNoTime($event['date_format'] === 'date') ->setNoTime($event['date_format'] === 'date' || (isset($event['allDay']) && $event['allDay']))
->setUseTimezone(true); ->setUseTimezone(true);
$vCalendar->addComponent($vEvent); $vCalendar->addComponent($vEvent);