From b53116653cd91b9a87cbfebb77c95c19fe754be2 Mon Sep 17 00:00:00 2001
From: Dennis Benz <dennis.benz@uni-osnabrueck.de>
Date: Fri, 7 Jul 2023 14:40:04 +0000
Subject: [PATCH] Fix course name localization in course administration, fixes
#2761
Closes #2761
Merge request studip/studip!1909
---
app/controllers/admin/courses.php | 6 +++---
app/views/admin/courses/_course.php | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php
index 71b75ce7aff..edf529b4ce4 100644
--- a/app/controllers/admin/courses.php
+++ b/app/controllers/admin/courses.php
@@ -477,7 +477,7 @@ class Admin_CoursesController extends AuthenticatedController
$data = [];
foreach ($courses as $course_id => $course) {
- $course_model = Course::buildExisting($course);
+ $course_model = Course::find($course_id);
$sem = new Seminar($course_model);
$row = [];
@@ -486,7 +486,7 @@ class Admin_CoursesController extends AuthenticatedController
}
if (in_array('name', $filter_config)) {
- $row['name'] = $course['Name'];
+ $row['name'] = $course_model->name;
}
if (in_array('type', $filter_config)) {
@@ -542,7 +542,7 @@ class Admin_CoursesController extends AuthenticatedController
foreach (PluginManager::getInstance()->getPlugins('AdminCourseContents') as $plugin) {
foreach ($plugin->adminAvailableContents() as $index => $label) {
if (in_array($plugin->getPluginId() . "_" . $index, $filter_config)) {
- $content = $plugin->adminAreaGetCourseContent(Course::find($course_id), $index);
+ $content = $plugin->adminAreaGetCourseContent($course_model, $index);
$row[$plugin->getPluginId() . "_" . $index] = strip_tags(is_a($content, 'Flexi_Template')
? $content->render()
: $content
diff --git a/app/views/admin/courses/_course.php b/app/views/admin/courses/_course.php
index 645b06e7443..e12d31a16d3 100644
--- a/app/views/admin/courses/_course.php
+++ b/app/views/admin/courses/_course.php
@@ -55,7 +55,7 @@ if (!$values['parent_course'] || !in_array($values['parent_course'], array_keys(
<? if ($GLOBALS['perm']->have_studip_perm("autor", $semid)) : ?>
<a href="<?= URLHelper::getLink('seminar_main.php', ['auswahl' => $semid]) ?>">
<? endif ?>
- <?= htmlReady(trim($values['Name'])) ?>
+ <?= htmlReady($course->name) ?>
<? if ($GLOBALS['perm']->have_studip_perm("autor", $semid)) : ?>
</a>
<? endif ?>
--
GitLab