From 6dac8fe74e30cd78fded181c43a28360d49b8346 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Wed, 13 Sep 2023 08:30:49 +0000
Subject: [PATCH] regard takes_place column before selecting resource booking
intervals for exporting, re #1703
Merge request studip/studip!2024
---
app/controllers/resources/export.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/controllers/resources/export.php b/app/controllers/resources/export.php
index eb88ef76ce8..a891af2bcfb 100644
--- a/app/controllers/resources/export.php
+++ b/app/controllers/resources/export.php
@@ -342,7 +342,8 @@ class Resources_ExportController extends AuthenticatedController
foreach ($resources as $resource) {
//Retrieve the bookings in the specified time range:
$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,
'begin' => $this->begin->getTimestamp(),
--
GitLab