L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-59984-master' of git://github.com/junpataleta/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2017-10-17 00:37:47 +02:00
parent d355cb54ab a3bfb41cdd
commit a9f816744b
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/enrollib.php
+2 -2
View File
@@ -1419,8 +1419,8 @@ function get_enrolled_join(context $context, $useridcolumn, $onlyactive = false,
"{$prefix}e1.courseid = :{$prefix}_e1_courseid",
);
if ($enrolid) {
$enrolconditions[] = "{$prefix}e1.id = :{$prefix}e1.enrolid";
$params[$prefix . 'e1.enrolid'] = $enrolid;
$enrolconditions[] = "{$prefix}e1.id = :{$prefix}e1_enrolid";
$params[$prefix . 'e1_enrolid'] = $enrolid;
}
$enrolconditionssql = implode(" AND ", $enrolconditions);
$joins[] = "JOIN {enrol} {$prefix}e1 ON ($enrolconditionssql)";
user/tests/behat/filter_participants.feature
+20
View File
@@ -82,6 +82,26 @@ Feature: Course participants can be filtered
And I should not see "Student 2" in the "participants" "table"
And I should not see "Student 4" in the "participants" "table"
And I should not see "Teacher 1" in the "participants" "table"
# Add more filters.
And I open the autocomplete suggestions list
And I click on "Enrolment methods: Manual enrolments" item in the autocomplete list
And I open the autocomplete suggestions list
And I click on "Group: Group 2" item in the autocomplete list
And I should see "Student 3" in the "participants" "table"
But I should not see "Teacher 1" in the "participants" "table"
And I should not see "Student 1" in the "participants" "table"
And I should not see "Student 2" in the "participants" "table"
And I should not see "Student 4" in the "participants" "table"
# Deselect the active status filter.
And I click on "Status: Active" "text" in the ".form-autocomplete-selection" "css_element"
# Apply Status: Inactive filter.
And I open the autocomplete suggestions list
And I click on "Status: Inactive" item in the autocomplete list
Then I should see "Student 2" in the "participants" "table"
But I should not see "Student 4" in the "participants" "table"
And I should not see "Student 1" in the "participants" "table"
And I should not see "Student 3" in the "participants" "table"
And I should not see "Teacher 1" in the "participants" "table"
@javascript
Scenario: Filter by keyword