aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMoritz Strohm <strohm@data-quest.de>2025-09-01 13:05:18 +0000
committerMoritz Strohm <strohm@data-quest.de>2025-09-01 13:05:18 +0000
commit5079ef1560064aaf3a41b9b17bdfc23299b94791 (patch)
tree58cbaba73edea5407b87aaea7fac7d54c6d73fb0 /lib
parentc5e52e2065d4670d33e246611dcbbdfd19dbc1d2 (diff)
added code for displaying more than one icon for a resource booking in the booking plan, fixes #1726issue-5869
Closes #1726 Merge request studip/studip!4421
Diffstat (limited to 'lib')
-rw-r--r--lib/models/resources/ResourceBooking.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/models/resources/ResourceBooking.php b/lib/models/resources/ResourceBooking.php
index 5e527d0..805cff0 100644
--- a/lib/models/resources/ResourceBooking.php
+++ b/lib/models/resources/ResourceBooking.php
@@ -1808,10 +1808,18 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
if (!$this->isSimpleBooking()) {
if ($this->assigned_course_date->metadate_id) {
- $icon = 'refresh';
+ if ($icon) {
+ //chat2 icon already set as first icon.
+ $icon .= ',';
+ }
+ $icon .= 'refresh';
}
} elseif ($this->repeat_end > $this->end) {
- $icon = 'refresh';
+ if ($icon) {
+ //chat2 icon already set as first icon.
+ $icon .= ',';
+ }
+ $icon .= 'refresh';
}
if ($this->assigned_course_date instanceof CourseDate) {