MDL-83617 gradereport_grader: fix encoding url

When changing the number of grades per page, the redirect url was encoded twice.
DSI-Universite-Rennes2 · Nov 1, 2024 · 297ed4e · 297ed4e
1 parent d015c4c
commit 297ed4e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php
@@ -204,7 +204,7 @@
 }
 
 $perpagedata = [
-    'baseurl' => new moodle_url('/grade/report/grader/index.php', ['id' => s($courseid), 'report' => 'grader']),
+    'baseurl' => (new moodle_url('/grade/report/grader/index.php', ['id' => s($courseid), 'report' => 'grader']))->out(false),
     'options' => []
 ];
 foreach ($pagingoptions as $key => $name) {

diff --git a/grade/report/grader/templates/perpage.mustache b/grade/report/grader/templates/perpage.mustache
@@ -43,7 +43,7 @@
 </label>
 {{#js}}
     document.getElementById('{{uniqid}}').addEventListener('change', function(e) {
-        var url = new URL('{{baseurl}}');
+        var url = new URL('{{{baseurl}}}');
         url.searchParams.set('perpage', e.target.value);
 
         window.location.href = url;

diff --git a/grade/report/grader/tests/behat/pagination.feature b/grade/report/grader/tests/behat/pagination.feature
@@ -67,6 +67,7 @@ Feature: grader report pagination
     Then I should see "103" node occurrences of type "tr" in the "user-grades" "table"
     And I should see "2" in the ".stickyfooter .pagination" "css_element"
     And I should not see "3" in the ".stickyfooter .pagination" "css_element"
+    And the url should match "#/grade/report/grader/index\.php\?id=[0-9]+&report=grader&perpage=100#"
 
   @javascript
   Scenario: The pagination bar is only displayed when there is more than one page