diff options
| author | Philipp Schüttlöffel <schuettloeffel@zqs.uni-hannover.de> | 2024-09-24 10:53:31 +0200 |
|---|---|---|
| committer | Philipp Schüttlöffel <schuettloeffel@zqs.uni-hannover.de> | 2024-09-24 10:53:31 +0200 |
| commit | 4459dd7917f4d1c34f40bb68f0e991e9c3d53e4c (patch) | |
| tree | 5c07151ae61276d334e88f6309c30d439a85c12e /templates/filesystem | |
| parent | da0022e5c1abbf9825ae76debaabdff7e8623bb4 (diff) | |
| parent | 97a188592c679890a25c37ab78463add76a52ff7 (diff) | |
Merge branch 'main' into issue-3911issue-3911
Diffstat (limited to 'templates/filesystem')
| -rw-r--r-- | templates/filesystem/group_folder/edit.php | 2 | ||||
| -rw-r--r-- | templates/filesystem/homework_folder/description.php | 9 | ||||
| -rw-r--r-- | templates/filesystem/timed_folder/description.php | 11 | ||||
| -rw-r--r-- | templates/filesystem/topic_folder/edit.php | 2 |
4 files changed, 3 insertions, 21 deletions
diff --git a/templates/filesystem/group_folder/edit.php b/templates/filesystem/group_folder/edit.php index 1d438bf..a5dc2f4 100644 --- a/templates/filesystem/group_folder/edit.php +++ b/templates/filesystem/group_folder/edit.php @@ -10,7 +10,7 @@ $groups = Statusgruppen::findBySeminar_id(Request::get('cid')); </option> <? endif; ?> <? foreach ($groups as $one_group): ?> - <option <?=(@$group->id === $one_group->id ? 'selected' : '')?> value="<?= htmlReady($one_group->id) ?>"> + <option <?= isset($group) && $group->id === $one_group->id ? 'selected' : '' ?> value="<?= htmlReady($one_group->id) ?>"> <?= htmlReady($one_group->name) ?> </option> <? endforeach; ?> diff --git a/templates/filesystem/homework_folder/description.php b/templates/filesystem/homework_folder/description.php index b3bc7f1..c47d6b0 100644 --- a/templates/filesystem/homework_folder/description.php +++ b/templates/filesystem/homework_folder/description.php @@ -1,14 +1,7 @@ <div style="font-style: italic"> <?=_("Dieser Ordner ist ein Hausaufgabenordner. Es können nur Dateien eingestellt werden.")?> </div> -<? if (!empty($own_files) && count($own_files) > 0) : ?> -<?= _("Sie selbst haben folgende Dateien in diesen Ordner eingestellt:") ?> - <ul> - <? foreach ($own_files as $own_file) :?> - <li><?=htmlReady($own_file->name)?> - <?=strftime('%x %X', $own_file->chdate)?></li> - <? endforeach ?> - </ul> -<? endif ?> + <? if ($folderdata['description']) : ?> <hr> <div> diff --git a/templates/filesystem/timed_folder/description.php b/templates/filesystem/timed_folder/description.php index ae5bd9e..396a286 100644 --- a/templates/filesystem/timed_folder/description.php +++ b/templates/filesystem/timed_folder/description.php @@ -36,17 +36,6 @@ <? endif ?> </div> -<? if (!empty($own_files) && count($own_files) > 0) : ?> - <div> - <?= _('Sie selbst haben folgende Dateien in diesen Ordner eingestellt:') ?> - <ul> - <? foreach ($own_files as $own_file) : ?> - <li><?= htmlReady($own_file->name) ?> - <?= strftime('%x %X', $own_file->chdate) ?></li> - <? endforeach ?> - </ul> - </div> -<? endif ?> - <? if ($folderdata['description']) : ?> <hr> <div> diff --git a/templates/filesystem/topic_folder/edit.php b/templates/filesystem/topic_folder/edit.php index 1ac39af..e4eb6b0 100644 --- a/templates/filesystem/topic_folder/edit.php +++ b/templates/filesystem/topic_folder/edit.php @@ -10,7 +10,7 @@ $topics = CourseTopic::findBySeminar_id($folder->range_id); </option> <? endif; ?> <? foreach ($topics as $one_topic): ?> - <option <?=(@$topic->id === $one_topic->id ? 'selected' : '')?> value="<?= htmlReady($one_topic->id) ?>"> + <option <?= isset($topic) && $topic->id === $one_topic->id ? 'selected' : '' ?> value="<?= htmlReady($one_topic->id) ?>"> <?= htmlReady($one_topic->title) ?> </option> <? endforeach; ?> |