Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
moodle
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
moodle
moodle
Commits
8a5f5c3e
Commit
8a5f5c3e
authored
Oct 27, 2020
by
Juan Segarra Montesinos
Committed by
Jenkins
Jan 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDL-69797 gradingform_rubric: Implement authorization into fetch method
parent
eda0980d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
65 additions
and
11 deletions
+65
-11
grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/fetch.php
...ric/classes/grades/grader/gradingpanel/external/fetch.php
+7
-2
grade/grading/form/rubric/tests/grades_grader_gradingpanel_rubric_external_fetch_test.php
...grades_grader_gradingpanel_rubric_external_fetch_test.php
+58
-9
No files found.
grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/fetch.php
View file @
8a5f5c3e
...
...
@@ -93,7 +93,7 @@ class fetch extends external_api {
* @since Moodle 3.8
*/
public
static
function
execute
(
string
$component
,
int
$contextid
,
string
$itemname
,
int
$gradeduserid
)
:
array
{
global
$CFG
;
global
$CFG
,
$USER
;
require_once
(
"
{
$CFG
->
libdir
}
/gradelib.php"
);
[
'component'
=>
$component
,
...
...
@@ -126,7 +126,12 @@ class fetch extends external_api {
}
// Fetch the actual data.
$gradeduser
=
\core_user
::
get_user
(
$gradeduserid
);
$gradeduser
=
\core_user
::
get_user
(
$gradeduserid
,
'*'
,
MUST_EXIST
);
// One can access its own grades. Others just if they're graders.
if
(
$gradeduserid
!=
$USER
->
id
)
{
$gradeitem
->
require_user_can_grade
(
$gradeduser
,
$USER
);
}
return
self
::
get_fetch_data
(
$gradeitem
,
$gradeduser
);
}
...
...
grade/grading/form/rubric/tests/grades_grader_gradingpanel_rubric_external_fetch_test.php
View file @
8a5f5c3e
...
...
@@ -186,8 +186,6 @@ class fetch_test extends advanced_testcase {
*/
public
function
test_execute_fetch_graded
()
:
void
{
$this
->
resetAfterTest
();
$generator
=
\testing_util
::
get_data_generator
();
$rubricgenerator
=
$generator
->
get_plugin_generator
(
'gradingform_rubric'
);
[
'forum'
=>
$forum
,
...
...
@@ -197,23 +195,73 @@ class fetch_test extends advanced_testcase {
'teacher'
=>
$teacher
,
]
=
$this
->
get_test_data
();
$this
->
setUser
(
$teacher
);
$this
->
execute_and_assert_fetch
(
$forum
,
$controller
,
$definition
,
$teacher
,
$teacher
,
$student
);
}
/**
* Class mates should not get other's grades.
*/
public
function
test_execute_fetch_does_not_return_data_to_other_students
()
:
void
{
$this
->
resetAfterTest
();
[
'forum'
=>
$forum
,
'controller'
=>
$controller
,
'definition'
=>
$definition
,
'student'
=>
$student
,
'teacher'
=>
$teacher
,
'course'
=>
$course
,
]
=
$this
->
get_test_data
();
$evilstudent
=
$this
->
getDataGenerator
()
->
create_and_enrol
(
$course
,
'student'
);
$this
->
expectException
(
\required_capability_exception
::
class
);
$this
->
execute_and_assert_fetch
(
$forum
,
$controller
,
$definition
,
$evilstudent
,
$teacher
,
$student
);
}
/**
* Grades can be returned to graded user.
*/
public
function
test_execute_fetch_return_data_to_graded_user
()
:
void
{
$this
->
resetAfterTest
();
[
'forum'
=>
$forum
,
'controller'
=>
$controller
,
'definition'
=>
$definition
,
'student'
=>
$student
,
'teacher'
=>
$teacher
,
]
=
$this
->
get_test_data
();
$this
->
execute_and_assert_fetch
(
$forum
,
$controller
,
$definition
,
$student
,
$teacher
,
$student
);
}
/**
* Executes and performs all the assertions of the fetch method with the given parameters.
*/
private
function
execute_and_assert_fetch
(
$forum
,
$controller
,
$definition
,
$fetcheruser
,
$grader
,
$gradeduser
)
{
$generator
=
\testing_util
::
get_data_generator
();
$rubricgenerator
=
$generator
->
get_plugin_generator
(
'gradingform_rubric'
);
$this
->
setUser
(
$grader
);
$gradeitem
=
component_gradeitem
::
instance
(
'mod_forum'
,
$forum
->
get_context
(),
'forum'
);
$grade
=
$gradeitem
->
get_grade_for_user
(
$
student
,
$teach
er
);
$instance
=
$gradeitem
->
get_advanced_grading_instance
(
$
teach
er
,
$grade
);
$grade
=
$gradeitem
->
get_grade_for_user
(
$
gradeduser
,
$grad
er
);
$instance
=
$gradeitem
->
get_advanced_grading_instance
(
$
grad
er
,
$grade
);
$submissiondata
=
$rubricgenerator
->
get_test_form_data
(
$controller
,
(
int
)
$
student
->
id
,
$submissiondata
=
$rubricgenerator
->
get_test_form_data
(
$controller
,
(
int
)
$
gradeduser
->
id
,
0
,
'Too many mistakes. Please try again.'
,
2
,
'Great number of pictures. Well done.'
);
$gradeitem
->
store_grade_from_formdata
(
$
student
,
$teach
er
,
(
object
)
[
$gradeitem
->
store_grade_from_formdata
(
$
gradeduser
,
$grad
er
,
(
object
)
[
'instanceid'
=>
$instance
->
get_id
(),
'advancedgrading'
=>
$submissiondata
,
]);
$result
=
fetch
::
execute
(
'mod_forum'
,
(
int
)
$forum
->
get_context
()
->
id
,
'forum'
,
(
int
)
$student
->
id
);
$this
->
setUser
(
$fetcheruser
);
$result
=
fetch
::
execute
(
'mod_forum'
,
(
int
)
$forum
->
get_context
()
->
id
,
'forum'
,
(
int
)
$gradeduser
->
id
);
$result
=
external_api
::
clean_returnvalue
(
fetch
::
execute_returns
(),
$result
);
$this
->
assertIsArray
(
$result
);
...
...
@@ -241,7 +289,7 @@ class fetch_test extends advanced_testcase {
$this
->
assertEquals
(
100
,
$result
[
'grade'
][
'maxgrade'
]);
$this
->
assertArrayHasKey
(
'gradedby'
,
$result
[
'grade'
]);
$this
->
assertEquals
(
fullname
(
$
teach
er
),
$result
[
'grade'
][
'gradedby'
]);
$this
->
assertEquals
(
fullname
(
$
grad
er
),
$result
[
'grade'
][
'gradedby'
]);
$this
->
assertArrayHasKey
(
'criteria'
,
$result
[
'grade'
]);
$criteria
=
$result
[
'grade'
][
'criteria'
];
...
...
@@ -348,6 +396,7 @@ class fetch_test extends advanced_testcase {
'definition'
=>
$definition
,
'student'
=>
$student
,
'teacher'
=>
$teacher
,
'course'
=>
$course
,
];
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment