Skip to content
Snippets Groups Projects
Commit 816c61be authored by Moritz Strohm's avatar Moritz Strohm Committed by Jan-Hendrik Willms
Browse files

regard takes_place column before selecting resource booking intervals for exporting, re #1703 

Merge request studip/studip!2024
parent 038a5bdc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/controllers/resources/export.php
+ 2
− 1
View file @ 816c61be
...@@ -339,7 +339,8 @@ class Resources_ExportController extends AuthenticatedController ...@@ -339,7 +339,8 @@ class Resources_ExportController extends AuthenticatedController
foreach ($resources as $resource) { foreach ($resources as $resource) {
//Retrieve the bookings in the specified time range: //Retrieve the bookings in the specified time range:
$intervals = ResourceBookingInterval::findBySql( $intervals = ResourceBookingInterval::findBySql(
'resource_id = :resource_id AND begin < :end AND end > :begin ORDER BY begin, end', "`takes_place` = 1 AND `resource_id` = :resource_id AND `begin` < :end AND `end` > :begin
ORDER BY `begin`, `end`",
[ [
'resource_id' => $resource->id, 'resource_id' => $resource->id,
'begin' => $this->begin->getTimestamp(), 'begin' => $this->begin->getTimestamp(),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment