From c4ab9b756121a9b180ebd7d776a664405d44b00f Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Mon, 4 Nov 2024 14:53:17 +0000
Subject: [PATCH] prevent php-warnings in room-requests, fixes #4814
Closes #4814
Merge request studip/studip!3603
---
app/controllers/resources/room_request.php | 4 ++--
app/views/resources/room_request/resolve.php | 25 ++++++++++++++++++++
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/app/controllers/resources/room_request.php b/app/controllers/resources/room_request.php
index 92b6688fb3b..7f7cdbe2b3e 100644
--- a/app/controllers/resources/room_request.php
+++ b/app/controllers/resources/room_request.php
@@ -1183,7 +1183,8 @@ class Resources_RoomRequestController extends AuthenticatedController
}
$this->show_info = true;
-
+ $this->booked_room_infos = [];
+ $this->request_semester_string = '';
if ($this->request->closed > 0) {
if ($this->request->closed == '3') {
PageLayout::setTitle(_('Abgelehnte Anfrage'));
@@ -1223,7 +1224,6 @@ class Resources_RoomRequestController extends AuthenticatedController
$this->request_time_intervals = $this->request->getGroupedTimeIntervals(true, false);
}
- $this->request_semester_string = '';
$request_start_semester = $this->request->getStartSemester();
$request_end_semester = $this->request->getEndSemester();
if ($request_start_semester && $request_end_semester && $request_start_semester->id != $request_end_semester->id && $request_end_semester->id) {
diff --git a/app/views/resources/room_request/resolve.php b/app/views/resources/room_request/resolve.php
index 444cd7a1522..bd96a92aadb 100644
--- a/app/views/resources/room_request/resolve.php
+++ b/app/views/resources/room_request/resolve.php
@@ -1,3 +1,28 @@
+<?php
+/**
+ * @var Resources_RoomRequestController $controller
+ * @var RoomRequest $request
+ * @var Resource|Room $request_resource
+ * @var array $booked_room_infos
+ * @var array $clipboards
+ * @var array $request_time_intervals
+ * @var array $room_availability
+ * @var array $alternative_rooms
+ * @var bool $show_info
+ * @var bool $show_form
+ * @var bool $user_is_global_autor
+ * @var bool $expand_metadates
+ * @var bool $show_force_resolve_button
+ * @var string $request_semester_string
+ * @var string $alternatives_selection
+ * @var string $selected_clipboard_id
+ * @var string $notification_settings
+ * @var QuickSearch $room_search
+ * @var Config $config
+ * @var User $current_user
+ */
+?>
+
<form id="resolve-request" class="default" method="post"
data-dialog="size=big;<?= Request::submitted('reload-on-close') ? 'reload-on-close' : ''; ?>"
action="<?= $controller->link_for('resources/room_request/resolve/' . $request->id) ?>">
--
GitLab