Merge branch 'master' into dev

bdecentgmbh · Feb 23, 2021 · f5c135b · f5c135b
2 parents 1be9b95 + 867c7a0
commit f5c135b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/classes/local/data_grid/filter/current_course_condition.php b/classes/local/data_grid/filter/current_course_condition.php
@@ -46,7 +46,7 @@ public function get_values() {
             return [null];
         }
 
-        return [$coursecontext->instanceid];
+        return [$coursecontext->id];
     }
 
     /**
@@ -62,4 +62,23 @@ public function get_label() {
 
         return get_string('currentcourse', 'block_dash');
     }
+
+    /**
+     * Return where SQL and params for placeholders.
+     *
+     * @return array
+     * @throws \coding_exception|\dml_exception
+     */
+    public function get_sql_and_params() {
+        list($sql, $params) = parent::get_sql_and_params();
+
+        if ($sql) {
+            if (!$coursecontext = $this->get_context()->get_course_context(false)) {
+                return ['', []];
+            }
+            $sql = 'EXISTS (SELECT * FROM {role_assignments} ra100 WHERE ra100.userid = u.id AND ' . $sql . ')';
+        }
+
+        return [$sql, $params];
+    }
 }
diff --git a/classes/local/data_source/users_data_source.php b/classes/local/data_source/users_data_source.php
@@ -150,9 +150,7 @@ public function build_filter_collection() {
         $filtercollection->add_filter(new logged_in_user_condition('current_user', 'u.id'));
         $filtercollection->add_filter(new participants_condition('participants', 'u.id'));
         $filtercollection->add_filter(new my_groups_condition('my_groups', 'gm300.groupid'));
-        $filtercollection->add_filter(new current_course_condition('current_course', 'c.id'));
-        $filtercollection->add_filter(new current_course_condition('current_course_groups', 'g.courseid',
-            get_string('currentcoursegroups', 'block_dash')));
+        $filtercollection->add_filter(new current_course_condition('current_course', 'ra100.contextid'));
 
         if (block_dash_has_pro()) {
             $filtercollection->add_filter(new \local_dash\data_grid\filter\parent_role_condition('parentrole', 'u.id'));

diff --git a/classes/local/layout/abstract_layout.php b/classes/local/layout/abstract_layout.php
@@ -130,7 +130,7 @@ public function build_preferences_form(\moodleform $form, \MoodleQuickForm $mfor
         self::$currentgroupid = random_int(1, 10000);
 
         $filtercollection = $this->get_data_source()->get_filter_collection();
-
+      
         if ($form->get_tab() == preferences_form::TAB_FIELDS) {
             if ($this->supports_field_visibility()) {
                 $group = [];