Skip to content
Snippets Groups Projects
Commit b5311665 authored by Dennis Benz's avatar Dennis Benz Committed by Elmar Ludwig
Browse files

Fix course name localization in course administration, fixes #2761

Closes #2761

Merge request studip/studip!1909
parent 6cd66647
No related branches found
No related tags found
No related merge requests found
...@@ -477,7 +477,7 @@ class Admin_CoursesController extends AuthenticatedController ...@@ -477,7 +477,7 @@ class Admin_CoursesController extends AuthenticatedController
$data = []; $data = [];
foreach ($courses as $course_id => $course) { foreach ($courses as $course_id => $course) {
$course_model = Course::buildExisting($course); $course_model = Course::find($course_id);
$sem = new Seminar($course_model); $sem = new Seminar($course_model);
$row = []; $row = [];
...@@ -486,7 +486,7 @@ class Admin_CoursesController extends AuthenticatedController ...@@ -486,7 +486,7 @@ class Admin_CoursesController extends AuthenticatedController
} }
if (in_array('name', $filter_config)) { if (in_array('name', $filter_config)) {
$row['name'] = $course['Name']; $row['name'] = $course_model->name;
} }
if (in_array('type', $filter_config)) { if (in_array('type', $filter_config)) {
...@@ -542,7 +542,7 @@ class Admin_CoursesController extends AuthenticatedController ...@@ -542,7 +542,7 @@ class Admin_CoursesController extends AuthenticatedController
foreach (PluginManager::getInstance()->getPlugins('AdminCourseContents') as $plugin) { foreach (PluginManager::getInstance()->getPlugins('AdminCourseContents') as $plugin) {
foreach ($plugin->adminAvailableContents() as $index => $label) { foreach ($plugin->adminAvailableContents() as $index => $label) {
if (in_array($plugin->getPluginId() . "_" . $index, $filter_config)) { 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') $row[$plugin->getPluginId() . "_" . $index] = strip_tags(is_a($content, 'Flexi_Template')
? $content->render() ? $content->render()
: $content : $content
......
...@@ -55,7 +55,7 @@ if (!$values['parent_course'] || !in_array($values['parent_course'], array_keys( ...@@ -55,7 +55,7 @@ if (!$values['parent_course'] || !in_array($values['parent_course'], array_keys(
<? if ($GLOBALS['perm']->have_studip_perm("autor", $semid)) : ?> <? if ($GLOBALS['perm']->have_studip_perm("autor", $semid)) : ?>
<a href="<?= URLHelper::getLink('seminar_main.php', ['auswahl' => $semid]) ?>"> <a href="<?= URLHelper::getLink('seminar_main.php', ['auswahl' => $semid]) ?>">
<? endif ?> <? endif ?>
<?= htmlReady(trim($values['Name'])) ?> <?= htmlReady($course->name) ?>
<? if ($GLOBALS['perm']->have_studip_perm("autor", $semid)) : ?> <? if ($GLOBALS['perm']->have_studip_perm("autor", $semid)) : ?>
</a> </a>
<? endif ?> <? endif ?>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment