Skip to content
Snippets Groups Projects
Commit 7336424c authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms Committed by Jan-Hendrik Willms
Browse files

fixes #3978

Closes #3978

Merge request studip/studip!2828
parent 70e01319
No related branches found
No related tags found
No related merge requests found
...@@ -126,7 +126,8 @@ class ModulesNotification ...@@ -126,7 +126,8 @@ class ModulesNotification
$navigation = MyRealmModel::getAdditionalNavigations($seminar_id, $s_data, null, $user_id, $visit_data[$seminar_id]); $navigation = MyRealmModel::getAdditionalNavigations($seminar_id, $s_data, null, $user_id, $visit_data[$seminar_id]);
$n_data = []; $n_data = [];
foreach ($this->registered_notification_modules as $id => $m_data) { foreach ($this->registered_notification_modules as $id => $m_data) {
if (in_array($id, $s_data['notification']) if (
in_array($id, $s_data['notification'])
&& isset($navigation[$id]) && isset($navigation[$id])
&& $navigation[$id]->getImage() && $navigation[$id]->getImage()
&& $navigation[$id]->getImage()->getRole() === Icon::ROLE_ATTENTION && $navigation[$id]->getImage()->getRole() === Icon::ROLE_ATTENTION
...@@ -165,14 +166,14 @@ class ModulesNotification ...@@ -165,14 +166,14 @@ class ModulesNotification
$base_url = URLHelper::setBaseURL(''); $base_url = URLHelper::setBaseURL('');
URLHelper::setBaseURl($base_url); URLHelper::setBaseURl($base_url);
if ($nav instanceof Navigation && $nav->isVisible(true)) { if ($nav instanceof Navigation && $nav->isVisible(true)) {
$url = 'seminar_main.php?again=yes&auswahl=' . $seminar_id . '&redirect_to=' . strtr($nav->getURL(), '?', '&'); $url = 'seminar_main.php?again=yes&auswahl=' . $seminar_id . '&redirect_to=' . strtr($nav->getURL(), '?', '&');
$icon = $nav->getImage(); $icon = $nav->getImage();
$text = $nav->getTitle(); $text = $nav->getTitle();
if (!$text) { if (!$text) {
$text = $this->registered_notification_modules[$id]['name']; $text = $this->registered_notification_modules[$id]['name'];
}
$text .= ' - ' . $nav->getLinkAttributes()['title'];
return compact('text', 'url', 'icon', 'seminar_id');
} }
$text .= ' - ' . $nav->getLinkAttributes()['title'];
return compact('text', 'url', 'icon', 'seminar_id');
}
} }
} }
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<? foreach ($news as $sem_titel => $data) : ?> <? foreach ($news as $sem_titel => $data) : ?>
<tr class="table_header_bold"> <tr class="table_header_bold">
<td colspan="2" style="font-weight: bold;"> <td colspan="2" style="font-weight: bold;">
<a href="<?= URLHelper::getLink('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['range_id']]) ?>"> <a href="<?= URLHelper::getLink('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['seminar_id']]) ?>">
<?= htmlReady($sem_titel) ?> <?= htmlReady($sem_titel) ?>
<?= (($semester = get_semester($data[0]['range_id'])) ? ' ('.$semester.')' : '') ?> <?= (($semester = get_semester($data[0]['range_id'])) ? ' ('.$semester.')' : '') ?>
</a> </a>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<? foreach ($news as $sem_titel => $data) : ?> <? foreach ($news as $sem_titel => $data) : ?>
<?= sprintf(_("In der Veranstaltung \"%s\" gibt es folgende Neuigkeiten:"), $sem_titel) ?> <?= sprintf(_("In der Veranstaltung \"%s\" gibt es folgende Neuigkeiten:"), $sem_titel) ?>
<?= URLHelper::getURL('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['range_id']]) ?> <?= URLHelper::getURL('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['seminar_id']]) ?>
<? foreach ($data as $module) : ?> <? foreach ($data as $module) : ?>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment