From 656f2e5a38ac61e23fae564a46f6cf848107721f Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Tue, 12 Nov 2019 15:59:53 +0800 Subject: [PATCH 1/2] MDL-66360 grade: Correct argument order in params --- .../grader/gradingpanel/scale/external/store.php | 10 +++++----- .../grades/grader/gradingpanel/external/store.php | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/grade/classes/grades/grader/gradingpanel/scale/external/store.php b/grade/classes/grades/grader/gradingpanel/scale/external/store.php index 88c185d824c..9101b0bff17 100644 --- a/grade/classes/grades/grader/gradingpanel/scale/external/store.php +++ b/grade/classes/grades/grader/gradingpanel/scale/external/store.php @@ -77,17 +77,17 @@ class store extends external_api { 'The ID of the user show', VALUE_REQUIRED ), - 'formdata' => new external_value( - PARAM_RAW, - 'The serialised form data representing the grade', - VALUE_REQUIRED - ), 'notifyuser' => new external_value( PARAM_BOOL, 'Wheteher to notify the user or not', VALUE_DEFAULT, false ), + 'formdata' => new external_value( + PARAM_RAW, + 'The serialised form data representing the grade', + VALUE_REQUIRED + ), ]); } diff --git a/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/store.php b/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/store.php index 8bbcb0b33b2..d569699304e 100644 --- a/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/store.php +++ b/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/store.php @@ -76,17 +76,17 @@ class store extends external_api { 'The ID of the user show', VALUE_REQUIRED ), - 'formdata' => new external_value( - PARAM_RAW, - 'The serialised form data representing the grade', - VALUE_REQUIRED - ), 'notifyuser' => new external_value( PARAM_BOOL, 'Wheteher to notify the user or not', VALUE_DEFAULT, false ), + 'formdata' => new external_value( + PARAM_RAW, + 'The serialised form data representing the grade', + VALUE_REQUIRED + ), ]); } From 0e32b5ae4141b290a43e9e01bb86d4215db4383f Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Tue, 12 Nov 2019 16:00:50 +0800 Subject: [PATCH 2/2] MDL-66360 grading: Validate notifyuser --- .../classes/grades/grader/gradingpanel/point/external/store.php | 2 ++ .../classes/grades/grader/gradingpanel/scale/external/store.php | 2 ++ .../guide/classes/grades/grader/gradingpanel/external/store.php | 2 ++ .../classes/grades/grader/gradingpanel/external/store.php | 2 ++ 4 files changed, 8 insertions(+) diff --git a/grade/classes/grades/grader/gradingpanel/point/external/store.php b/grade/classes/grades/grader/gradingpanel/point/external/store.php index 09d86c49d79..469a62a4cce 100644 --- a/grade/classes/grades/grader/gradingpanel/point/external/store.php +++ b/grade/classes/grades/grader/gradingpanel/point/external/store.php @@ -117,12 +117,14 @@ class store extends external_api { 'contextid' => $contextid, 'itemname' => $itemname, 'gradeduserid' => $gradeduserid, + 'notifyuser' => $notifyuser, 'formdata' => $formdata, ] = self::validate_parameters(self::execute_parameters(), [ 'component' => $component, 'contextid' => $contextid, 'itemname' => $itemname, 'gradeduserid' => $gradeduserid, + 'notifyuser' => $notifyuser, 'formdata' => $formdata, ]); diff --git a/grade/classes/grades/grader/gradingpanel/scale/external/store.php b/grade/classes/grades/grader/gradingpanel/scale/external/store.php index 9101b0bff17..8a3f5edfddf 100644 --- a/grade/classes/grades/grader/gradingpanel/scale/external/store.php +++ b/grade/classes/grades/grader/gradingpanel/scale/external/store.php @@ -114,12 +114,14 @@ class store extends external_api { 'contextid' => $contextid, 'itemname' => $itemname, 'gradeduserid' => $gradeduserid, + 'notifyuser' => $notifyuser, 'formdata' => $formdata, ] = self::validate_parameters(self::execute_parameters(), [ 'component' => $component, 'contextid' => $contextid, 'itemname' => $itemname, 'gradeduserid' => $gradeduserid, + 'notifyuser' => $notifyuser, 'formdata' => $formdata, ]); diff --git a/grade/grading/form/guide/classes/grades/grader/gradingpanel/external/store.php b/grade/grading/form/guide/classes/grades/grader/gradingpanel/external/store.php index 0e138e2674d..589d9c35109 100644 --- a/grade/grading/form/guide/classes/grades/grader/gradingpanel/external/store.php +++ b/grade/grading/form/guide/classes/grades/grader/gradingpanel/external/store.php @@ -118,12 +118,14 @@ class store extends external_api { 'contextid' => $contextid, 'itemname' => $itemname, 'gradeduserid' => $gradeduserid, + 'notifyuser' => $notifyuser, 'formdata' => $formdata, ] = self::validate_parameters(self::execute_parameters(), [ 'component' => $component, 'contextid' => $contextid, 'itemname' => $itemname, 'gradeduserid' => $gradeduserid, + 'notifyuser' => $notifyuser, 'formdata' => $formdata, ]); diff --git a/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/store.php b/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/store.php index d569699304e..6174ce29bc2 100644 --- a/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/store.php +++ b/grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/store.php @@ -113,12 +113,14 @@ class store extends external_api { 'contextid' => $contextid, 'itemname' => $itemname, 'gradeduserid' => $gradeduserid, + 'notifyuser' => $notifyuser, 'formdata' => $formdata, ] = self::validate_parameters(self::execute_parameters(), [ 'component' => $component, 'contextid' => $contextid, 'itemname' => $itemname, 'gradeduserid' => $gradeduserid, + 'notifyuser' => $notifyuser, 'formdata' => $formdata, ]);