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

link courses and institutes in admin user view, fixes #4457 

Closes #4457

Merge request studip/studip!3242
parent 53729c3d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/views/admin/user/_course_files.php
+ 28
− 22
View file @ c91fbd09
<?php <?php
/** /**
* @var Admin_UserController $controller * @var Admin_UserController $controller
* @var array $course_files * @var array<string, array<string, array{course: Course, files: int}>> $course_files
* @var array $params * @var array $params
* @var User $user * @var User $user
*/ */
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<?= _('Dateiübersicht Veranstaltungen') ?> <?= _('Dateiübersicht Veranstaltungen') ?>
</h1> </h1>
</header> </header>
<? foreach ($course_files as $semester_name => $file_date) : ?> <? foreach ($course_files as $semester_name => $file_data) : ?>
<article id="<?= $semester_name ?>" class="<?= ContentBoxHelper::classes($semester_name) ?>"> <article id="<?= htmlReady($semester_name) ?>" class="<?= ContentBoxHelper::classes($semester_name) ?>">
<header> <header>
<h1> <h1>
<a href="<?= ContentBoxHelper::href($semester_name) ?>"> <a href="<?= ContentBoxHelper::href($semester_name) ?>">
...@@ -40,11 +40,17 @@ ...@@ -40,11 +40,17 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<? foreach ($file_date as $data): ?> <? foreach ($file_data as $data): ?>
<tr> <tr>
<td><?= htmlReady($data['course']->veranstaltungsnummer) ?></td>
<td> <td>
<?= htmlReady($data['course']->name) ?> <a href="<?= URLHelper::getLink('seminar_main.php', ['auswahl' => $data['course']->id]) ?>">
<?= htmlReady($data['course']->veranstaltungsnummer) ?>
</a>
</td>
<td>
<a href="<?= URLHelper::getLink('seminar_main.php', ['auswahl' => $data['course']->id]) ?>">
<?= htmlReady($data['course']->name) ?>
</a>
</td> </td>
<td> <td>
<?= htmlReady($data['course']->getSemType()['name'])?> <?= htmlReady($data['course']->getSemType()['name'])?>
...@@ -57,23 +63,23 @@ ...@@ -57,23 +63,23 @@
<? endif ?> <? endif ?>
</td> </td>
<td class="actions"> <td class="actions">
<? if ($data['files']) : ?> <? if ($data['files']) : ?>
<? <?= ActionMenu::get()
$actionMenu = ActionMenu::get()->setContext($data['course']->name); ->setContext($data['course']->name)
$actionMenu->addLink($controller->url_for('admin/user/list_files/' . $user['user_id'] . '/' . $data['course']->id, $params), ->addLink(
_('Dateien auflisten'), $controller->list_filesURL($user->id, $data['course']->id, $params),
Icon::create('folder-full', 'clickable'), _('Dateien auflisten'),
['data-dialog' => 'size=50%']); Icon::create('folder-full'),
$actionMenu->addLink($controller->url_for('admin/user/download_user_files/' . $user['user_id'] . '/' . $data['course']->id), ['data-dialog' => 'size=50%']
_('Dateien als ZIP herunterladen'), )
Icon::create('download', 'clickable')); ->addLink(
$controller->download_user_filesURL($user->id, $data['course']->id),
?> _('Dateien als ZIP herunterladen'),
Icon::create('download')
<?= $actionMenu->render() ?> )
<? endif ?> ?>
<? endif ?>
</td> </td>
</tr> </tr>
<? endforeach; ?> <? endforeach; ?>
</tbody> </tbody>
......
app/views/admin/user/_institute_files.php
+ 18
− 14
View file @ c91fbd09
<?php <?php
/** /**
* @var Admin_UserController $controller * @var Admin_UserController $controller
* @var Institute[] $institutes * @var array<int, array{Institut_id: string, Name: string, files: int}> $institutes
* @var User $user * @var User $user
* @var array $params * @var array $params
*/ */
...@@ -32,30 +32,34 @@ ...@@ -32,30 +32,34 @@
<? foreach ($institutes as $institute): ?> <? foreach ($institutes as $institute): ?>
<tr> <tr>
<td> <td>
<?= htmlReady($institute['Name']) ?> <a href="<?= URLHelper::getLink('dispatch.php/institute/overview', ['auswahl' => $institute['Institut_id']]) ?>">
<?= htmlReady($institute['Name']) ?>
</a>
</td> </td>
<td> <td>
<? if ((int)$institute['files']) : ?> <? if ($institute['files']) : ?>
<?= sprintf('%u %s', $institute['files'], _('Dokumente')) ?> <?= sprintf('%u %s', $institute['files'], _('Dokumente')) ?>
<? else : ?> <? else : ?>
- -
<? endif ?> <? endif ?>
</td> </td>
<td class="actions"> <td class="actions">
<? if ($institute['files']) : ?> <? if ($institute['files']) : ?>
<? <?= ActionMenu::get()
$actionMenu = ActionMenu::get()->setContext($institute['Name']); ->setContext($institute['Name'])
$actionMenu->addLink($controller->url_for('admin/user/list_files/' . $user['user_id'] . '/' . $institute['Institut_id'] , $params), ->addLink(
$controller->list_filesURL($user->id, $institute['Institut_id'], $params),
_('Dateien auflisten'), _('Dateien auflisten'),
Icon::create('folder-full'), Icon::create('folder-full'),
['data-dialog' => 'size=50%']); ['data-dialog' => 'size=50%']
$actionMenu->addLink($controller->url_for('admin/user/download_user_files/' . $user['user_id'] . '/' . $institute['Institut_id']), )
->addLink(
$controller->download_user_filesURL($user->id, $institute['Institut_id']),
_('Dateien als ZIP herunterladen'), _('Dateien als ZIP herunterladen'),
Icon::create('download')); Icon::create('download')
)
?> ?>
<?= $actionMenu->render() ?> <? endif ?>
<? endif ?>
</td> </td>
</tr> </tr>
<? endforeach; ?> <? endforeach; ?>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment