From d56736401ffe4aa6016c6cf6da425d6343fd984d Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Tue, 27 Jul 2021 16:55:11 +0200
Subject: [PATCH] imported diff for Trac TIC 11552
---
.../course/room_requests/_request_edit_header.php | 10 +++++++++-
lib/models/resources/ResourceRequest.class.php | 4 ++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/app/views/course/room_requests/_request_edit_header.php b/app/views/course/room_requests/_request_edit_header.php
index 26c55414128..89790d6ab00 100644
--- a/app/views/course/room_requests/_request_edit_header.php
+++ b/app/views/course/room_requests/_request_edit_header.php
@@ -12,7 +12,15 @@
<section class="resources-grid">
<section class="contentbox">
<header><h1><?= _('Anfrage') ?></h1></header>
- <section><?= htmlready($request->getTypeString(), 1, 1) ?></section>
+ <section>
+ <?= htmlready($request->getTypeString(), 1, 1) ?>
+ <? if ($request->getType() == 'course'): ?>
+ <?
+ $dates = $request->getDateString(true);
+ ?>
+ <?= tooltipHtmlIcon(implode('<br>', $dates)) ?>
+ <? endif ?>
+ </section>
</section>
<section class="contentbox">
<header><h1><?= _('Bearbeitungsstatus') ?></h1></header>
diff --git a/lib/models/resources/ResourceRequest.class.php b/lib/models/resources/ResourceRequest.class.php
index 236a2c08f34..58e2f915f0b 100644
--- a/lib/models/resources/ResourceRequest.class.php
+++ b/lib/models/resources/ResourceRequest.class.php
@@ -1397,7 +1397,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
} else {
return sprintf(
_('Regelmäßige Termine (%s)'),
- $this->cycle->toString('short')
+ $this->cycle->toString('full')
);
}
} elseif ($this->course) {
@@ -2307,4 +2307,4 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
$diff = round(($first['begin'] - time()) / 86400);
return $diff;
}
-}
\ No newline at end of file
+}
--
GitLab