MDL-78761 enrol: correct enrolment suspended state report filter.

2023-07-21 17:13:06 +01:00
parent acf600a9b4
commit 6cbb421d31
2 changed files with 5 additions and 6 deletions
@@ -149,7 +149,6 @@ class enrolment extends base {
            ->add_joins($this->get_joins())
            ->set_type(column::TYPE_TEXT)
            ->add_field($this->get_status_field_sql(), 'status')
-            ->add_field("{$userenrolments}.userid")
            ->set_is_sortable(true)
            ->add_callback([enrolment_formatter::class, 'enrolment_status']);

@@ -200,7 +199,7 @@ class enrolment extends base {
                           THEN " . status_field::STATUS_NOT_CURRENT . "
                           ELSE " . status_field::STATUS_ACTIVE . "
                      END
-                 ELSE " . status_field::STATUS_SUSPENDED . "
+                 ELSE {$userenrolments}.status
            END";
    }

@@ -67,14 +67,14 @@ class enrolment {
    /**
     * Return enrolment status for user
     *
-     * @param string $value
-     * @param stdClass $row
+     * @param string|null $value
     * @return string|null
     */
-    public static function enrolment_status(string $value, stdClass $row): ?string {
-        if (!$row->userid) {
+    public static function enrolment_status(?string $value): ?string {
+        if ($value === null) {
            return null;
        }
+
        $statusvalues = self::enrolment_values();

        $value = (int) $value;