From 450224cd1fbb75bc7ba09b8c24bddc39484575ff Mon Sep 17 00:00:00 2001 From: Peter Thienel Date: Wed, 3 Jan 2024 11:10:24 +0000 Subject: =?UTF-8?q?Resolve=20"MVV:=20Ausgabetemplates=20f=C3=BCr=20Objektn?= =?UTF-8?q?amen"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #3386 Merge request studip/studip!2305 --- app/controllers/search/studiengaenge.php | 2 +- app/views/search/breadcrumb.php | 4 +- app/views/search/module/_modul.php | 6 +- app/views/search/studiengaenge/einfach.php | 2 +- app/views/search/studiengaenge/mehrfach.php | 2 +- app/views/search/studiengaenge/verlauf.php | 2 +- .../5.5.20_tic_3386_templates_for_mvv_objects.php | 122 +++++++++++++++++++++ .../userfilter/StgteilVersionCondition.class.php | 2 +- lib/models/Abschluss.php | 17 ++- lib/models/Aufbaustudiengang.php | 4 +- lib/models/Fachbereich.php | 18 ++- lib/models/Modul.php | 29 ++--- lib/models/ModulLanguage.php | 2 +- lib/models/ModuleManagementModel.php | 97 ++++++++-------- lib/models/ModuleManagementModelTreeItem.php | 7 +- lib/models/Modulteil.php | 22 +++- lib/models/ModulteilLanguage.php | 2 +- lib/models/MvvContact.php | 6 +- lib/models/MvvContactRange.php | 4 +- lib/models/MvvCourse.php | 2 +- lib/models/MvvFile.php | 6 +- lib/models/StgteilVersion.php | 59 ++++------ lib/models/StgteilabschnittModul.php | 43 +++----- lib/models/Studiengang.php | 30 +++-- lib/models/StudiengangTeil.php | 25 +++-- lib/models/StudycourseLanguage.php | 2 +- lib/models/StudycourseType.php | 2 +- 27 files changed, 317 insertions(+), 202 deletions(-) create mode 100644 db/migrations/5.5.20_tic_3386_templates_for_mvv_objects.php diff --git a/app/controllers/search/studiengaenge.php b/app/controllers/search/studiengaenge.php index 3987ab5..ab4d4de 100644 --- a/app/controllers/search/studiengaenge.php +++ b/app/controllers/search/studiengaenge.php @@ -511,7 +511,7 @@ class Search_StudiengaengeController extends MVVController // semester is unknown $options[$version->id] = trim($options[$version->id]) - ?: $version->getDisplayName(ModuleManagementModel::DISPLAY_STGTEIL); + ?: $version->getDisplayName(); } $widget->setOptions($options, $this->cur_version_id); $widget->setMaxLength(100); diff --git a/app/views/search/breadcrumb.php b/app/views/search/breadcrumb.php index 5d74fbc..534eb58 100644 --- a/app/views/search/breadcrumb.php +++ b/app/views/search/breadcrumb.php @@ -11,11 +11,11 @@ getDisplayName() . ' (' . $additional_object->name . ')') ?> - getDisplayName() . ': ' . $additional_object->getDisplayName(ModuleManagementModel::DISPLAY_FACH)) ?> + getDisplayName() . ': ' . $additional_object->getDisplayName()) ?> - getDisplayName(ModuleManagementModel::DISPLAY_FACH)) ?> + getDisplayName()) ?> getDisplayName(0)) ?> diff --git a/app/views/search/module/_modul.php b/app/views/search/module/_modul.php index 1aadce74..53c05d8 100644 --- a/app/views/search/module/_modul.php +++ b/app/views/search/module/_modul.php @@ -1,19 +1,19 @@ - + asImg(['title' => _('Vollständige Modulbeschreibung')]) ?> getAssignedCoursesBySemester($selected_semester->id, $GLOBALS['user']->id))) : ?> id}/#{$modul->id}") ?>"> - getDisplayName(ModuleManagementModel::DISPLAY_CODE)) ?> + getDisplayName()) ?> - getDisplayName(ModuleManagementModel::DISPLAY_CODE)) ?> + getDisplayName()) ?> diff --git a/app/views/search/studiengaenge/einfach.php b/app/views/search/studiengaenge/einfach.php index 9250a7e..05da9fb 100644 --- a/app/views/search/studiengaenge/einfach.php +++ b/app/views/search/studiengaenge/einfach.php @@ -1,5 +1,5 @@ render_partial('search/breadcrumb') ?> -

getDisplayName(ModuleManagementModel::DISPLAY_ABSCHLUSS)) ?>

+

getDisplayName()) ?>