Merge branch 'MDL-67122-master' of https://github.com/mickhawkins/moodle

mod/forum/report/summary/amd/src/filters.js

@@ -114,6 +114,21 @@ export const init = (root) => {
         };
     }
 
+    // Override download link so the file is generated with filters.
+    const downloadForm = document.getElementById('summaryreport').querySelector('form.dataformatselector');
+    if (downloadForm) {
+        downloadForm.onsubmit = (event) => {
+            const downloadType = downloadForm.querySelector('#downloadtype_download').value;
+            const getParams = `download=${downloadType}`;
+            const prevAction = document.forms.filtersform.action;
+
+            generateWithFilters(event, getParams);
+
+            // Revert action, so re-submitting the form via filter does not trigger a further download.
+            document.forms.filtersform.action = prevAction;
+        };
+    }
+
     // Submit report via filter
     const submitWithFilter = (containerelement) => {
         // Disable the dates filter mform checker to prevent any changes triggering a warning to the user.

mod/forum/report/summary/classes/summary_table.php

@@ -103,7 +103,8 @@ class summary_table extends table_sql {
      * @param bool $canseeprivatereplies Whether the user can see all private replies or not.
      * @param int $perpage The number of rows to display per page.
      */
-    public function __construct(int $courseid, array $filters, bool $allowbulkoperations, bool $canseeprivatereplies, int $perpage) {
+    public function __construct(int $courseid, array $filters, bool $allowbulkoperations,
+            bool $canseeprivatereplies, int $perpage) {
         global $USER, $OUTPUT;
 
         $forumid = $filters['forums'][0];

mod/forum/report/summary/templates/bulk_action_menu.mustache

@@ -47,7 +47,20 @@
                 "value": "#messageselect"
             }
         ],
-        "perpage" : "<div class='singleselect'></div>"
+        "perpage": {
+            "name": "perpage",
+            "method": "get",
+            "action": "#",
+            "classes": "singleselect",
+            "label": "Per page",
+            "formid": "randomid",
+            "id": "selectperpage",
+            "options":[
+                {"value": 50, "name": "50", "selected": true},
+                {"value": 100, "name": "100", "selected":false},
+                {"value": 200, "name": "200", "selected": false}
+            ]
+        }
     }
 }}