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

fix activity overview, fixes #834

parent a492d961
No related branches found
No related tags found
No related merge requests found
...@@ -1234,7 +1234,6 @@ class Admin_UserController extends AuthenticatedController ...@@ -1234,7 +1234,6 @@ class Admin_UserController extends AuthenticatedController
} }
PageLayout::setTitle(sprintf(_('Datei- und Aktivitätsübersicht für %s'), $this->fullname)); PageLayout::setTitle(sprintf(_('Datei- und Aktivitätsübersicht für %s'), $this->fullname));
$this->queries = $this->getActivities($user_id); $this->queries = $this->getActivities($user_id);
$memberships = DBManager::get()->fetchAll("SELECT seminar_user.*, seminare.Name as course_name $memberships = DBManager::get()->fetchAll("SELECT seminar_user.*, seminare.Name as course_name
...@@ -1260,9 +1259,9 @@ class Admin_UserController extends AuthenticatedController ...@@ -1260,9 +1259,9 @@ class Admin_UserController extends AuthenticatedController
if ($count) { if ($count) {
if (!isset($course_files[$membership->seminar_id])) { if (!isset($course_files[$membership->seminar_id])) {
$course_files[$membership->course->start_semester->name][$membership->course->id]['course'] = $membership->course; $course_files[(string) $membership->course->start_semester->name][$membership->course->id]['course'] = $membership->course;
} }
$course_files[$membership->course->start_semester->name][$membership->course->id]['files'] = $count; $course_files[(string) $membership->course->start_semester->name][$membership->course->id]['files'] = $count;
} }
} }
if (in_array(Request::get('view'), words('courses closed_courses'))) { if (in_array(Request::get('view'), words('courses closed_courses'))) {
...@@ -1273,9 +1272,9 @@ class Admin_UserController extends AuthenticatedController ...@@ -1273,9 +1272,9 @@ class Admin_UserController extends AuthenticatedController
WHERE sc.seminar_id =?', [$membership->seminar_id]); WHERE sc.seminar_id =?', [$membership->seminar_id]);
if ((int)$closed_course) { if ((int)$closed_course) {
$closed_courses[$membership->course->start_semester->name][$membership->course->id] = $membership; $closed_courses[(string) $membership->course->start_semester->name][$membership->course->id] = $membership;
} else { } else {
$courses[$membership->course->start_semester->name][$membership->course->id] = $membership; $courses[(string) $membership->course->start_semester->name][$membership->course->id] = $membership;
} }
} }
} }
......
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