MDL-60924 core_user: Hold participant filters when clicking some link

diff --git a/user/amd/build/name_page_filter.min.js b/user/amd/build/name_page_filter.min.js
deleted file mode 100644 (file)
index 2d4fcac..0000000
Binary files a/user/amd/build/name_page_filter.min.js and /dev/null differ

diff --git a/user/amd/src/name_page_filter.js b/user/amd/src/name_page_filter.js
deleted file mode 100644 (file)
index 8ebf4e7..0000000
--- a/user/amd/src/name_page_filter.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Name and page filter JS module for the course participants page.
- *
- * @module     core_user/name_page_filter
- * @package    core_user
- * @copyright  2017 Mihail Geshoski
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-define(['jquery', 'core_user/unified_filter'],
-        function($, UnifiedFilter) {
-
-    /**
-     * Selectors.
-     *
-     * @access private
-     * @type {{NAME_FILTERS: string, PAGE_FILTERS: string}}
-     */
-    var SELECTORS = {
-        NAME_FILTERS: 'a.letter',
-        PAGE_FILTERS: 'a.page-link'
-    };
-
-    /**
-     * Init function.
-     *
-     * @method init
-     * @private
-     */
-    var init = function() {
-        $(SELECTORS.NAME_FILTERS + ', ' + SELECTORS.PAGE_FILTERS).on('click', function(e) {
-            e.preventDefault();
-            var href = $(this).attr('href');
-            UnifiedFilter.getForm().attr('action', href);
-            UnifiedFilter.getForm().submit();
-        });
-    };
-
-    return /** @alias module:core/form-autocomplete */ {
-        // Public variables and functions.
-        /**
-         * Initialise the name and page user filter.
-         *
-         * @method init
-         */
-        'init': function() {
-            init();
-        }
-    };
-});

diff --git a/user/index.php b/user/index.php
index 1ee8596..958cb05 100644 (file)
--- a/user/index.php
+++ b/user/index.php
@@ -224,6 +224,10 @@ echo $renderer->unified_filter($course, $context, $filtersapplied, $baseurl);
 
 echo '<div class="userlist">';
 
+// Add filters to the baseurl after creating unified_filter to avoid losing them.
+foreach ($filtersapplied as $filter) {
+    $baseurl->param('unified-filters[]', $filter);
+}
 $participanttable = new \core_user\participants_table($course->id, $groupid, $lastaccess, $roleid, $enrolid, $status,
     $searchkeywords, $bulkoperations, $selectall);
 $participanttable->define_baseurl($baseurl);
@@ -245,8 +249,6 @@ if ($bulkoperations) {
 
 echo $participanttablehtml;
 
-$PAGE->requires->js_call_amd('core_user/name_page_filter', 'init');
-
 $perpageurl = clone($baseurl);
 $perpageurl->remove_params('perpage');
 if ($perpage == SHOW_ALL_PAGE_SIZE && $participanttable->totalrows > DEFAULT_PAGE_SIZE) {

diff --git a/user/tests/behat/filter_participants.feature b/user/tests/behat/filter_participants.feature
index 5e022b5..073ce49 100644 (file)
--- a/user/tests/behat/filter_participants.feature
+++ b/user/tests/behat/filter_participants.feature
@@ -117,6 +117,21 @@ Feature: Course participants can be filtered
     And I should see "Student 4" in the "participants" "table"
     And I should not see "Teacher 1" in the "participants" "table"
 
+  @javascript
+  Scenario: Reorder users without losing filter
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I navigate to course participants
+    And I open the autocomplete suggestions list
+    And I click on "Role: Student" item in the autocomplete list
+    When I click on "Surname" "link"
+    Then I should see "Role: Student"
+    And I should see "Student 1" in the "participants" "table"
+    And I should see "Student 2" in the "participants" "table"
+    And I should see "Student 3" in the "participants" "table"
+    And I should see "Student 4" in the "participants" "table"
+    And I should not see "Teacher 1" in the "participants" "table"
+
   @javascript
   Scenario: Rendering filter options for teachers in a course that don't support groups
     Given I log in as "teacher1"

diff --git a/user/tests/behat/filter_participants_showall.feature b/user/tests/behat/filter_participants_showall.feature
new file mode 100644 (file)
index 0000000..7f1ac9a
--- /dev/null
+++ b/user/tests/behat/filter_participants_showall.feature
@@ -0,0 +1,90 @@
+@core @core_user
+Feature: Course participants can be filtered to display all the users
+  In order to filter the list of course participants
+  As a user
+  I need to visit the course participants page, apply the appropriate filters and show all users per page
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname | groupmode |
+      | Course 1 | C1        |     1     |
+      | Course 2 | C2        |     0     |
+    And the following "users" exist:
+      | username  | firstname | lastname | email                 |
+      | student1  | Student   | 1        | student1@example.com  |
+      | student2  | Student   | 2        | student2@example.com  |
+      | student3  | Student   | 3        | student3@example.com  |
+      | student4  | Student   | 4        | student4@example.com  |
+      | student5  | Student   | 5        | student5@example.com  |
+      | student6  | Student   | 6        | student6@example.com  |
+      | student7  | Student   | 7        | student7@example.com  |
+      | student8  | Student   | 8        | student8@example.com  |
+      | student9  | Student   | 9        | student9@example.com  |
+      | student10 | Student   | 10       | student10@example.com |
+      | student11 | Student   | 11       | student11@example.com |
+      | student12 | Student   | 12       | student12@example.com |
+      | student13 | Student   | 13       | student13@example.com |
+      | student14 | Student   | 14       | student14@example.com |
+      | student15 | Student   | 15       | student15@example.com |
+      | student16 | Student   | 16       | student16@example.com |
+      | student17 | Student   | 17       | student17@example.com |
+      | student18 | Student   | 18       | student18@example.com |
+      | student19 | Student   | 19       | student19@example.com |
+      | student20 | Student   | 20       | student20@example.com |
+      | student21 | Student   | 21       | student21@example.com |
+      | student22 | Student   | 22       | student22@example.com |
+      | student23 | Student   | 23       | student23@example.com |
+      | student24 | Student   | 24       | student24@example.com |
+      | teacher1  | Teacher   | 1        | teacher1@example.com |
+    And the following "course enrolments" exist:
+      | user      | course | role           | status | timeend       |
+      | student1  | C1     | student        |    0   |               |
+      | student2  | C1     | student        |    1   |               |
+      | student3  | C1     | student        |    0   |               |
+      | student4  | C1     | student        |    0   |               |
+      | student5  | C1     | student        |    0   |               |
+      | student6  | C1     | student        |    0   |               |
+      | student7  | C1     | student        |    0   |               |
+      | student8  | C1     | student        |    0   |               |
+      | student9  | C1     | student        |    0   |               |
+      | student10 | C1     | student        |    0   |               |
+      | student11 | C1     | student        |    0   |               |
+      | student12 | C1     | student        |    0   |               |
+      | student13 | C1     | student        |    0   |               |
+      | student14 | C1     | student        |    0   |               |
+      | student15 | C1     | student        |    0   |               |
+      | student16 | C1     | student        |    0   |               |
+      | student17 | C1     | student        |    0   |               |
+      | student18 | C1     | student        |    0   |               |
+      | student19 | C1     | student        |    0   |               |
+      | student20 | C1     | student        |    0   |               |
+      | student21 | C1     | student        |    0   |               |
+      | student22 | C1     | student        |    0   |               |
+      | student23 | C1     | student        |    0   |               |
+      | student24 | C1     | student        |    0   |               |
+      | student1  | C2     | student        |    0   |               |
+      | student2  | C2     | student        |    0   |               |
+      | student3  | C2     | student        |    0   |               |
+      | teacher1  | C1     | editingteacher |    0   |               |
+      | teacher1  | C2     | editingteacher |    0   |               |
+    And the following "groups" exist:
+      | name    | course | idnumber |
+      | Group 1 | C1     | G1       |
+      | Group 2 | C1     | G2       |
+    And the following "group members" exist:
+      | user     | group |
+      | student2 | G1    |
+      | student2 | G2    |
+      | student3 | G2    |
+
+  @javascript
+  Scenario: Show all filtered users for a course
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I navigate to course participants
+    When I open the autocomplete suggestions list
+    And I click on "Role: Student" item in the autocomplete list
+    And I click on "Show all 24" "link"
+    Then I should see "Role: Student"
+    And I should see "Number of participants: 24" in the "//div[@class='userlist']" "xpath_element"
+    And I should see "Show 20 per page"