diff options
| author | André Noack <noack@data-quest.de> | 2024-02-26 14:45:40 +0000 |
|---|---|---|
| committer | André Noack <noack@data-quest.de> | 2024-02-26 14:45:40 +0000 |
| commit | 59f9ac49944b62a584a2c941a41840ce04722d16 (patch) | |
| tree | 6ddc68c76d3034c9c94d7665f944435ecaefb593 /app/controllers/room_management/planning.php | |
| parent | 1145e3fcd7e285cd963124d47bf05c135538d2a5 (diff) | |
Resolve #179 "Buchungen mit Kommentaren: Nur Buchungen mit internen Kommentaren werden angezeigt"issue-3763
Closes #179
Merge request studip/studip!2583
Diffstat (limited to 'app/controllers/room_management/planning.php')
| -rw-r--r-- | app/controllers/room_management/planning.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/room_management/planning.php b/app/controllers/room_management/planning.php index 9bfd00f..c450c64 100644 --- a/app/controllers/room_management/planning.php +++ b/app/controllers/room_management/planning.php @@ -1063,7 +1063,7 @@ class RoomManagement_PlanningController extends AuthenticatedController public function booking_comments_action($selected_clipboard_id = null) { - PageLayout::setTitle(_('Buchungen mit Kommentaren')); + PageLayout::setTitle(_('Buchungsübersicht mit Kommentaren')); if (Navigation::hasItem('/resources/planning/booking_comments')) { Navigation::activateItem('/resources/planning/booking_comments'); @@ -1139,7 +1139,7 @@ class RoomManagement_PlanningController extends AuthenticatedController $this->clipboard = $clipboard; if ($clipboard) { PageLayout::setTitle( - $clipboard->name . ': ' . _('Buchungen mit Kommentaren') + $clipboard->name . ': ' . _('Buchungsübersicht mit Kommentaren') ); $room_ids = $clipboard->getAllRangeIds('Room'); $rooms = Resource::findMany($room_ids); @@ -1193,8 +1193,7 @@ class RoomManagement_PlanningController extends AuthenticatedController $booking_intervals = ResourceBookingInterval::findBySql( "INNER JOIN resource_bookings rb ON resource_booking_intervals.booking_id = rb.id - WHERE rb.internal_comment <> '' - AND rb.resource_id IN ( :room_ids ) + WHERE rb.resource_id IN ( :room_ids ) AND resource_booking_intervals.begin < :end AND resource_booking_intervals.end > :begin ORDER BY resource_booking_intervals.begin ASC, resource_booking_intervals.end ASC", [ |