From 65e61e2a0f587acace44cc500cf1dc90e638db2c Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Thu, 26 Feb 2026 20:44:42 +0100
Subject: added name-type format in Institute::getFullName

---
 app/controllers/lvgruppen/lvgruppen.php  | 2 +-
 app/controllers/massmail/permissions.php | 2 +-
 app/controllers/search/globalsearch.php  | 2 +-
 app/views/admin/user/index.php           | 2 +-
 app/views/settings/studies/institute.php | 4 ++--
 lib/models/Institute.php                 | 1 +
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/controllers/lvgruppen/lvgruppen.php b/app/controllers/lvgruppen/lvgruppen.php
index 9b1e951..4340a11 100644
--- a/app/controllers/lvgruppen/lvgruppen.php
+++ b/app/controllers/lvgruppen/lvgruppen.php
@@ -411,7 +411,7 @@ class Lvgruppen_LvgruppenController extends MVVController
                 $widget->addElement(
                     new SelectElement(
                         $institute->id,
-                        ($institute->isFaculty() ? '' : ' ') . $institute->getFullName(),
+                        ($institute->isFaculty() ? '' : ' ') . $institute->getFullName('name-type'),
                         $institute->id === $selected_fachbereich
                     ),
                     'select-' . $institute->name
diff --git a/app/controllers/massmail/permissions.php b/app/controllers/massmail/permissions.php
index ab8d075..5c20bf0 100644
--- a/app/controllers/massmail/permissions.php
+++ b/app/controllers/massmail/permissions.php
@@ -61,7 +61,7 @@ class Massmail_PermissionsController extends \AuthenticatedController
 
         $institutes = [];
         foreach (Institute::findAll() as $one) {
-            $institutes[$one->id] = $one->getFullName();
+            $institutes[$one->id] = $one->getFullName('name-type');
         }
 
         $degrees = [];
diff --git a/app/controllers/search/globalsearch.php b/app/controllers/search/globalsearch.php
index 055725c..64cdcb9 100644
--- a/app/controllers/search/globalsearch.php
+++ b/app/controllers/search/globalsearch.php
@@ -153,7 +153,7 @@ class Search_GlobalsearchController extends AuthenticatedController
 
         $insts = Institute::findAll();
         foreach ($insts as $institute) {
-            $institutes[$institute->id] = ($institute->isFaculty() ? '' : '  ') . $institute->getFullName();
+            $institutes[$institute->id] = ($institute->isFaculty() ? '' : '  ') . $institute->getFullName('name-type');
         }
         return $institutes;
     }
diff --git a/app/views/admin/user/index.php b/app/views/admin/user/index.php
index e4631ac..c5acc91 100644
--- a/app/views/admin/user/index.php
+++ b/app/views/admin/user/index.php
@@ -92,7 +92,7 @@ use Studip\Button;
                 <? foreach ($institutes as $institute) : ?>
                     <option value="<?= htmlReady($institute->id) ?>"
                         <?= isset($request['institute']) && $request['institute'] === $institute->id ? 'selected' : ''?>>
-                        <?= htmlReady($institute->getFullName()) ?>
+                        <?= htmlReady($institute->getFullName('name-type')) ?>
                     </option>
                 <? endforeach ?>
             </select>
diff --git a/app/views/settings/studies/institute.php b/app/views/settings/studies/institute.php
index 792e864..04db938 100644
--- a/app/views/settings/studies/institute.php
+++ b/app/views/settings/studies/institute.php
@@ -81,11 +81,11 @@
                     ): ?>
                         <option class="<?= $i->isFaculty() ? 'nested-item-header' : 'nested-item' ?>"
                                 value="<?= htmlReady($i->id) ?>">
-                            <?= htmlReady($i->getFullName()) ?>
+                            <?= htmlReady($i->getFullName('name-type')) ?>
                         </option>
                     <? else: ?>
                         <option class="<?= $i->isFaculty() ? 'nested-item-header' : 'nested-item' ?>" disabled>
-                            <?= htmlReady($i->getFullName()) ?>
+                            <?= htmlReady($i->getFullName('name-type')) ?>
                         </option>
                     <? endif; ?>
                 <? endforeach; ?>
diff --git a/lib/models/Institute.php b/lib/models/Institute.php
index 802ab84..dbffab9 100644
--- a/lib/models/Institute.php
+++ b/lib/models/Institute.php
@@ -277,6 +277,7 @@ class Institute extends SimpleORMap implements Range
     public function getFullName($format = 'default'): string
     {
         $template['type-name'] = '%2$s: %1$s';
+        $template['name-type'] = '%1$s (%2$s)';
         if ($format === 'default' || !isset($template[$format])) {
            $format = 'type-name';
         }
-- 
cgit v1.0