From bf8f915abc47409b1d799e7cb1cf9a3f11414b5d Mon Sep 17 00:00:00 2001
From: Davo Smith <git@davosmith.co.uk>
Date: Wed, 23 Sep 2015 17:14:46 +0100
Subject: [PATCH] MDL-51341 enrolment: fix 'No group' enrolled user filter

---
 enrol/locallib.php                            |  6 +-
 .../tests/behat/filter_enrolled_users.feature | 60 +++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 enrol/tests/behat/filter_enrolled_users.feature

diff --git a/enrol/locallib.php b/enrol/locallib.php
index 8ea4d24c815..8a3cbe3a6b7 100644
--- a/enrol/locallib.php
+++ b/enrol/locallib.php
@@ -242,7 +242,11 @@ class course_enrolment_manager {
                       JOIN {user_enrolments} ue ON (ue.userid = u.id  AND ue.enrolid $instancessql)
                       JOIN {enrol} e ON (e.id = ue.enrolid)
                  LEFT JOIN {user_lastaccess} ul ON (ul.courseid = e.courseid AND ul.userid = u.id)
-                 LEFT JOIN {groups_members} gm ON u.id = gm.userid
+                 LEFT JOIN {groups_members} gm ON u.id = gm.userid AND gm.groupid IN (
+                               SELECT g.id
+                                 FROM {groups} g
+                                WHERE g.courseid = e.courseid
+                           )
                      WHERE $filtersql
                   ORDER BY $sort $direction";
             $this->users[$key] = $DB->get_records_sql($sql, $params, $page*$perpage, $perpage);
diff --git a/enrol/tests/behat/filter_enrolled_users.feature b/enrol/tests/behat/filter_enrolled_users.feature
new file mode 100644
index 00000000000..d8075074b58
--- /dev/null
+++ b/enrol/tests/behat/filter_enrolled_users.feature
@@ -0,0 +1,60 @@
+@core_enrol @core_group
+Feature: Enrolled users can be filtered by group
+  In order to filter the list of enrolled users
+  As a teacher
+  I need to visit the enrolled users page and select a group to filter by
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+      | Course 2 | C2        |
+    And the following "users" exist:
+      | username | firstname | lastname |
+      | student1 | Student   | 1        |
+      | student2 | Student   | 2        |
+      | student3 | Student   | 3        |
+      | teacher1 | Teacher   | 1        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | student1 | C1     | student        |
+      | student2 | C1     | student        |
+      | student3 | C1     | student        |
+      | student1 | C2     | student        |
+      | student2 | C2     | student        |
+      | student3 | C2     | student        |
+      | teacher1 | C1     | editingteacher |
+      | teacher1 | C2     | editingteacher |
+    And the following "groups" exist:
+      | name    | course | idnumber |
+      | Group 1 | C1     | G1       |
+      | Group 2 | C1     | G2       |
+      | Group 3 | C2     | G3       |
+    And the following "group members" exist:
+      | user     | group |
+      | student2 | G1    |
+      | student2 | G2    |
+      | student3 | G2    |
+      | student1 | G3    |
+
+  Scenario Outline:
+    Given I log in as "teacher1"
+    And I follow "Course 1"
+    And I navigate to "Enrolled users" node in "Course administration > Users"
+
+    When I set the field "Group" to "<group>"
+    And I press "Filter"
+
+    Then I should see "<expected1>"
+    And I should see "<expected2>"
+    And I should see "<expected3>"
+    And I should not see "<notexpected1>"
+    And I should not see "<notexpected2>"
+
+    # Note the 'XX-IGNORE-XX' elements are for when there is less than 2 'not expected' items.
+    Examples:
+      | group            | expected1 | expected2 | expected3 | notexpected1 | notexpected2 |
+      | All participants | Student 1 | Student 2 | Student 3 | XX-IGNORE-XX | XX-IGNORE-XX |
+      | No group         | Student 1 |           |           | Student 2    | Student 3    |
+      | Group 1          | Student 2 |           |           | Student 1    | Student 3    |
+      | Group 2          | Student 2 | Student 3 |           | Student 1    | XX-IGNORE-XX |