mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-05 15:57:04 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-80017-master' of https://github.com/jleyva/moodle

Browse Source
This commit is contained in:
Huong Nguyen 2024-08-01 09:11:37 +07:00
commit c81be53a7b
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A
5 changed files with 13 additions and 4 deletions
.upgradenotes
MDL-80017-2024072409112838.yml
grade
classes/external
get_gradeitems.php
report/user
classes/external
user.php
tests
externallib_test.php
tests/external
get_gradeitems_test.php

9
.upgradenotes/MDL-80017-2024072409112838.yml Normal file

@ -0,0 +1,9 @@
issueNumber: MDL-80017
notes:
core_grades:
- message: >
The grade `itemname` property contained in the return structure of
the following external methods is now PARAM_RAW:
- `core_grades_get_gradeitems`
- `gradereport_user_get_grade_items`
type: changed

2
grade/classes/external/get_gradeitems.php vendored

@ -96,7 +96,7 @@ class get_gradeitems extends external_api {
'gradeItems' => new external_multiple_structure( 'gradeItems' => new external_multiple_structure(
new external_single_structure([ new external_single_structure([
'id' => new external_value(PARAM_ALPHANUM, 'An ID for the grade item', VALUE_REQUIRED), 'id' => new external_value(PARAM_ALPHANUM, 'An ID for the grade item', VALUE_REQUIRED),
'itemname' => new external_value(PARAM_CLEANHTML, 'The full name of the grade item', VALUE_REQUIRED), 'itemname' => new external_value(PARAM_RAW, 'The full name of the grade item', VALUE_REQUIRED),
'category' => new external_value(PARAM_TEXT, 'The grade category of the grade item', VALUE_OPTIONAL), 'category' => new external_value(PARAM_TEXT, 'The grade category of the grade item', VALUE_OPTIONAL),
]) ])
), ),

2
grade/report/user/classes/external/user.php vendored

@ -509,7 +509,7 @@ class user extends external_api {
new external_single_structure( new external_single_structure(
[ [
'id' => new external_value(PARAM_INT, 'Grade item id'), 'id' => new external_value(PARAM_INT, 'Grade item id'),
'itemname' => new external_value(PARAM_CLEANHTML, 'Grade item name'), 'itemname' => new external_value(PARAM_RAW, 'Grade item name'),
'itemtype' => new external_value(PARAM_ALPHA, 'Grade item type'), 'itemtype' => new external_value(PARAM_ALPHA, 'Grade item type'),
'itemmodule' => new external_value(PARAM_PLUGIN, 'Grade item module'), 'itemmodule' => new external_value(PARAM_PLUGIN, 'Grade item module'),
'iteminstance' => new external_value(PARAM_INT, 'Grade item instance'), 'iteminstance' => new external_value(PARAM_INT, 'Grade item instance'),

2
grade/report/user/tests/externallib_test.php

@ -72,7 +72,7 @@ class externallib_test extends externallib_advanced_testcase {
groups_add_member($group1->id, $teacher->id); groups_add_member($group1->id, $teacher->id);
groups_add_member($group2->id, $student2->id); groups_add_member($group2->id, $student2->id);
$assignment = $this->getDataGenerator()->create_module('assign', ['name' => "Test assign", 'course' => $course->id]); $assignment = $this->getDataGenerator()->create_module('assign', ['name' => "Test assign & grade items", 'course' => $course->id]);
$modcontext = get_coursemodule_from_instance('assign', $assignment->id, $course->id); $modcontext = get_coursemodule_from_instance('assign', $assignment->id, $course->id);
$assignment->cmidnumber = $modcontext->id; $assignment->cmidnumber = $modcontext->id;

2
grade/tests/external/get_gradeitems_test.php vendored

@ -41,7 +41,7 @@ class get_gradeitems_test extends \externallib_advanced_testcase {
$course = $this->getDataGenerator()->create_course(); $course = $this->getDataGenerator()->create_course();
$this->getDataGenerator()->create_module('forum', ['course' => $course->id]); $this->getDataGenerator()->create_module('forum', ['course' => $course->id]);
$this->getDataGenerator()->create_module('h5pactivity', ['course' => $course->id]); $this->getDataGenerator()->create_module('h5pactivity', ['course' => $course->id]);
$this->getDataGenerator()->create_module('assign', ['course' => $course->id]); $this->getDataGenerator()->create_module('assign', ['course' => $course->id, 'name' => 'Assignment & grade items']);
$result = get_gradeitems::execute($course->id); $result = get_gradeitems::execute($course->id);
$result = external_api::clean_returnvalue(get_gradeitems::execute_returns(), $result); $result = external_api::clean_returnvalue(get_gradeitems::execute_returns(), $result);