diff options
| author | Jan-Hendrik Willms <tleilax+github@gmail.com> | 2022-03-30 10:33:29 +0200 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+github@gmail.com> | 2022-03-30 10:33:29 +0200 |
| commit | 694cf29e5fe1b98e3c41baae8da745dc35a0af6e (patch) | |
| tree | e5af70cfcb868fb1595e20b1e3b7d41ae0f3ba0d /app/controllers/admin/user.php | |
| parent | a492d961b7dec1d87536dcbd2d03423d6d33fce7 (diff) | |
fix activity overview, fixes #834
Diffstat (limited to 'app/controllers/admin/user.php')
| -rw-r--r-- | app/controllers/admin/user.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php index 6ca339e..c868304 100644 --- a/app/controllers/admin/user.php +++ b/app/controllers/admin/user.php @@ -1234,7 +1234,6 @@ class Admin_UserController extends AuthenticatedController } PageLayout::setTitle(sprintf(_('Datei- und Aktivitätsübersicht für %s'), $this->fullname)); - $this->queries = $this->getActivities($user_id); $memberships = DBManager::get()->fetchAll("SELECT seminar_user.*, seminare.Name as course_name @@ -1260,9 +1259,9 @@ class Admin_UserController extends AuthenticatedController if ($count) { 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'))) { @@ -1273,9 +1272,9 @@ class Admin_UserController extends AuthenticatedController WHERE sc.seminar_id =?', [$membership->seminar_id]); 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 { - $courses[$membership->course->start_semester->name][$membership->course->id] = $membership; + $courses[(string) $membership->course->start_semester->name][$membership->course->id] = $membership; } } } |