diff options
| author | David Siegfried <david.siegfried@uni-vechta.de> | 2022-11-02 08:09:14 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2022-11-02 08:09:14 +0000 |
| commit | 1e9f2810615f7b375e3133a9f8fbdbc767513978 (patch) | |
| tree | ca60815c430c6d3378a96596b0eacef2f964d175 /app/controllers/course/statusgroups.php | |
| parent | f71ee9305d044b982ae4d65e5c29671dc8b40d9e (diff) | |
prevent php8-warnings, refs #1733
Merge request studip/studip!1128
Diffstat (limited to 'app/controllers/course/statusgroups.php')
| -rw-r--r-- | app/controllers/course/statusgroups.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/app/controllers/course/statusgroups.php b/app/controllers/course/statusgroups.php index 46618e2..e0ed12e 100644 --- a/app/controllers/course/statusgroups.php +++ b/app/controllers/course/statusgroups.php @@ -137,13 +137,16 @@ class Course_StatusgroupsController extends AuthenticatedController } } $groupdata['load'] = true; + } else { + $groupdata['load'] = false; } if (!$this->is_tutor && $g->userMayJoin($GLOBALS['user']->id)) { - $groupdata['joinable'] = true; $joinable = true; + } else { + $joinable = false; } - + $groupdata['joinable'] = $joinable; $this->groups[] = $groupdata; } @@ -161,8 +164,8 @@ class Course_StatusgroupsController extends AuthenticatedController "SELECT `statusgruppe_id` FROM `statusgruppen` WHERE `range_id` = ?", [$this->course_id]) ]); - $ungrouped_count = $ungrouped_count[0]; - if ($ungrouped_count > 0) { + $this->ungrouped_count = $ungrouped_count[0]; + if ($this->ungrouped_count > 0) { // Create dummy entry for "no group" users. $no_group = new StdClass(); $no_group->id = 'nogroup'; @@ -172,7 +175,7 @@ class Course_StatusgroupsController extends AuthenticatedController $groupdata = [ 'group' => $no_group, - 'membercount' => $ungrouped_count, + 'membercount' => $this->ungrouped_count, 'joinable' => false, 'invisible_users' => 0, 'members' => [] @@ -214,6 +217,8 @@ class Course_StatusgroupsController extends AuthenticatedController } } $this->groups[] = $groupdata; + } else { + $this->nogroupmembers = []; } // Prepare search object for MultiPersonSearch. @@ -300,6 +305,7 @@ class Course_StatusgroupsController extends AuthenticatedController */ public function getgroup_action($group_id) { + $this->sort_by = ''; if ($group_id != 'nogroup') { $this->group = Statusgruppen::find($group_id); $this->members = []; |
