mirror of
https://github.com/grocy/grocy.git
synced 2025-08-21 04:43:32 +00:00
Fixed meal plan product/note calendar items links (fixes #1897)
This commit is contained in:
@@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
### Calendar
|
### Calendar
|
||||||
|
|
||||||
- xxx
|
- Fixed that clicking on meal plan product and notes calendar entries redirected to an invalid page
|
||||||
|
|
||||||
### Tasks
|
### Tasks
|
||||||
|
|
||||||
|
@@ -154,7 +154,8 @@ class CalendarService extends BaseService
|
|||||||
$mealPlanNotesEvents[] = [
|
$mealPlanNotesEvents[] = [
|
||||||
'title' => $titlePrefix . $titlePrefix2 . $mealPlanDayNote->note,
|
'title' => $titlePrefix . $titlePrefix2 . $mealPlanDayNote->note,
|
||||||
'start' => $start,
|
'start' => $start,
|
||||||
'date_format' => $dateFormat
|
'date_format' => $dateFormat,
|
||||||
|
'link' => $this->UrlManager->ConstructUrl('/mealplan' . '?start=' . $start)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,7 +182,8 @@ class CalendarService extends BaseService
|
|||||||
$mealPlanProductEvents[] = [
|
$mealPlanProductEvents[] = [
|
||||||
'title' => $titlePrefix . $titlePrefix2 . FindObjectInArrayByPropertyValue($products, 'id', $mealPlanDayProduct->product_id)->name,
|
'title' => $titlePrefix . $titlePrefix2 . FindObjectInArrayByPropertyValue($products, 'id', $mealPlanDayProduct->product_id)->name,
|
||||||
'start' => $start,
|
'start' => $start,
|
||||||
'date_format' => $dateFormat
|
'date_format' => $dateFormat,
|
||||||
|
'link' => $this->UrlManager->ConstructUrl('/mealplan' . '?start=' . $start)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user