Skip to content
Snippets Groups Projects
Commit 3fa639da authored by Moritz Strohm's avatar Moritz Strohm
Browse files

fix for BIESt #800

Merge request studip/studip!587
parent 26f43b74
No related branches found
No related tags found
No related merge requests found
...@@ -270,7 +270,7 @@ class FilesController extends AuthenticatedController ...@@ -270,7 +270,7 @@ class FilesController extends AuthenticatedController
)->setActive($current_view == 'all_files'); )->setActive($current_view == 'all_files');
$views->addLink( $views->addLink(
_('Persönlicher Dateibereich'), _('Meine hochgeladenen Dateien'),
$this->url_for('files/overview', ['view' => 'my_uploaded_files']), $this->url_for('files/overview', ['view' => 'my_uploaded_files']),
null, null,
[], [],
...@@ -506,10 +506,36 @@ class FilesController extends AuthenticatedController ...@@ -506,10 +506,36 @@ class FilesController extends AuthenticatedController
$this->files[] = $file_ref->getFileType(); $this->files[] = $file_ref->getFileType();
} }
} elseif ($this->current_view == 'my_uploaded_files') { } elseif ($this->current_view == 'my_uploaded_files') {
$this->page_size = 25;
$this->page = 1;
if (!$course_did_change) {
$this->page = Request::get('page') + 1;
}
if (($this->page < 1) || !$this->page) {
$this->page = 1;
}
$offset = $this->page_size * ($this->page - 1);
$this->addFiltersToOverviewSidebar(['time_range', 'course']); $this->addFiltersToOverviewSidebar(['time_range', 'course']);
$this->table_title = _('Persönlicher Dateibereich'); $this->table_title = _('Meine hochgeladenen Dateien');
$file_refs = FileRef::findUploadedFiles($GLOBALS['user']->id, $this->begin, $this->end, $this->course_id); $file_refs = FileRef::findUploadedFiles($GLOBALS['user']->id, $this->begin, $this->end, $this->course_id, $this->page_size, $offset);
$this->files_c = FileRef::countUploadedFiles($GLOBALS['user']->id, $this->begin, $this->end, $this->course_id); $this->files_c = FileRef::countUploadedFiles($GLOBALS['user']->id, $this->begin, $this->end, $this->course_id);
$pagination = Pagination::create(
$this->files_c,
$this->page - 1,
$this->page_size
);
$this->pagination_html = $pagination->asLinks(
function ($page_id) {
return URLHelper::getLink(
'dispatch.php/files/overview',
[
'view' => 'my_uploaded_files',
'page' => $page_id
]
);
}
);
$this->files = []; $this->files = [];
foreach ($file_refs as $file_ref) { foreach ($file_refs as $file_ref) {
$this->files[] = $file_ref->getFileType(); $this->files[] = $file_ref->getFileType();
......
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