aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJan-Hendrik Willms <tleilax+studip@gmail.com>2024-05-06 07:14:06 +0000
committerJan-Hendrik Willms <tleilax+studip@gmail.com>2024-05-06 07:14:06 +0000
commit463161ebfd669120ccd747db0c7df405ae2ace2c (patch)
treedf819b667ac1f25f7b9b6b41a8e996eb79524f75 /app
parent21f741c44215044c162fc1f0044bcbc052004d2e (diff)
fixes #4104
Closes #4104 Merge request studip/studip!2952
Diffstat (limited to 'app')
-rw-r--r--app/controllers/admin/courseplanning.php2
-rw-r--r--app/views/admin/courseplanning/pick_color.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/admin/courseplanning.php b/app/controllers/admin/courseplanning.php
index b8971e2..44b372d 100644
--- a/app/controllers/admin/courseplanning.php
+++ b/app/controllers/admin/courseplanning.php
@@ -82,7 +82,7 @@ class Admin_CourseplanningController extends AuthenticatedController
foreach ($this->events as $event) {
$start_date_time = explode('T', $event['start']);
$time_elements = explode(':', $start_date_time[1]);
- if (!$event['comform'] || $time_elements[0] % 2) {
+ if (!$event['conform'] || $time_elements[0] % 2) {
Sidebar::get()->getWidget('actions')->addLink(
_('Veranstaltungen außerhalb des Rasters'),
$this->nonconformURL(),
diff --git a/app/views/admin/courseplanning/pick_color.php b/app/views/admin/courseplanning/pick_color.php
index dbd93a8..61cc7fc 100644
--- a/app/views/admin/courseplanning/pick_color.php
+++ b/app/views/admin/courseplanning/pick_color.php
@@ -13,10 +13,12 @@
<div id="event-color-picker"></div>
+<? if (!empty($semtype)): ?>
<label>
<input name="event_color_semtype" type="checkbox" value="1">
<?= sprintf(_('Farbtyp für alle VA dieses Typs (%s) übernehmen'), htmlReady($semtype)) ?>
</label>
+<? endif; ?>
<div data-dialog-button>
<?= Studip\Button::createAccept(_('Speichern'), 'save') ?>