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

third batch of changes, re #2193

Merge request studip/studip!1425
parent 5d014803
No related branches found
No related tags found
1 merge request!4Draft: Icon creation
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
</a> </a>
</td> </td>
</tr> </tr>
<? $i++ ?>
<? endforeach; ?> <? endforeach; ?>
</tbody> </tbody>
</table> </table>
......
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
<th class="actions"> <th class="actions">
<?= ActionMenu::get() <?= ActionMenu::get()
->setContext($th_title) ->setContext($th_title)
->condition($mail_status) ->condition($mail_status ?? false)
->addLink( ->addLink(
$controller->url_for('messages/write?filter=inst_status', [ $controller->url_for('messages/write?filter=inst_status', [
'who' => $key, 'who' => $key ?? '',
'default_subject' => Context::get()->Name, 'default_subject' => Context::get()->Name,
'inst_id' => Context::getId(), 'inst_id' => Context::getId(),
]), ]),
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
Icon::create('mail', 'clickable'), Icon::create('mail', 'clickable'),
['data-dialog' => ''] ['data-dialog' => '']
) )
->condition($mail_gruppe) ->condition($mail_gruppe ?? false)
->addLink( ->addLink(
$controller->url_for('messages/write', [ $controller->url_for('messages/write', [
'group_id' => $group->id, 'group_id' => $group->id ?? null,
'default_subject' => Context::get()->Name, 'default_subject' => Context::get()->Name,
]), ]),
sprintf(_('Nachricht an alle Mitglieder der Gruppe %s verschicken'), $th_title), sprintf(_('Nachricht an alle Mitglieder der Gruppe %s verschicken'), $th_title),
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
<td class="toggle-indicator"> <td class="toggle-indicator">
<a class="mvv-load-in-new-row" <a class="mvv-load-in-new-row"
href="<?= $controller->action_link('details_studiengang/' . $studiengang->id) ?>"> href="<?= $controller->action_link('details_studiengang/' . $studiengang->id) ?>">
<? $ampel_icon = $GLOBALS['MVV_STUDIENGANG']['STATUS']['values'][$studiengang->stat]['icon'] ?> <? $ampel_icon = $GLOBALS['MVV_STUDIENGANG']['STATUS']['values'][$studiengang->stat]['icon'] ?? null; ?>
<? $ampelstatus = $GLOBALS['MVV_STUDIENGANG']['STATUS']['values'][$studiengang->stat]['name'] ?> <? $ampelstatus = $GLOBALS['MVV_STUDIENGANG']['STATUS']['values'][$studiengang->stat]['name'] ?? null; ?>
<? if ($ampel_icon) : ?> <? if ($ampel_icon) : ?>
<?= $ampel_icon->asImg(['title' => $ampelstatus, 'style' => 'vertical-align: text-top;']) ?> <?= $ampel_icon->asImg(['title' => $ampelstatus, 'style' => 'vertical-align: text-top;']) ?>
<? 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