L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-62535-master-fix' of github.com:abgreeve/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2018-08-30 13:49:15 +08:00
parent cf76059eda dfc5e6d10e
commit 6950592fcd
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/grading/form/guide/classes/privacy/provider.php
+1 -1
View File
@@ -83,7 +83,7 @@ class provider implements
WHERE gf.instanceid = :instanceid";
$records = $DB->get_records_sql($sql, $params);
if ($records) {
$subcontext = array_merge($subcontext, [get_string('guide', 'gradingform_guide')]);
$subcontext = array_merge($subcontext, [get_string('guide', 'gradingform_guide'), $instanceid]);
writer::with_context($context)->export_data($subcontext, (object) $records);
}
}
grade/grading/form/guide/tests/privacy_test.php
+2 -1
View File
@@ -128,10 +128,11 @@ class gradingform_guide_privacy_testcase extends provider_testcase {
// Update this instance with data.
$instance->update($data);
$instanceid = $instance->get_data('id');
// Let's try the method we are testing.
provider::export_gradingform_instance_data($modulecontext, $instance->get_id(), ['Test']);
$data = (array) writer::with_context($modulecontext)->get_data(['Test', 'Marking guide']);
$data = (array) writer::with_context($modulecontext)->get_data(['Test', 'Marking guide', $instanceid]);
$this->assertCount(2, $data);
$this->assertEquals('Spelling mistakes', $data['Spelling mistakes']->shortname);
$this->assertEquals('This user made several mistakes.', $data['Spelling mistakes']->remark);
grade/grading/form/rubric/classes/privacy/provider.php
+1 -1
View File
@@ -72,7 +72,7 @@ class provider implements
WHERE rf.instanceid = :instanceid";
$records = $DB->get_records_sql($sql, $params);
if ($records) {
$subcontext = array_merge($subcontext, [get_string('rubric', 'gradingform_rubric')]);
$subcontext = array_merge($subcontext, [get_string('rubric', 'gradingform_rubric'), $instanceid]);
\core_privacy\local\request\writer::with_context($context)->export_data($subcontext, (object) $records);
}
}
grade/grading/form/rubric/tests/privacy_test.php
+2 -1
View File
@@ -85,10 +85,11 @@ class gradingform_rubric_privacy_testcase extends provider_testcase {
// Update this instance with data.
$instance->update($data);
$instanceid = $instance->get_data('id');
// Let's try the method we are testing.
provider::export_gradingform_instance_data($modulecontext, $instance->get_id(), ['Test']);
$data = (array) writer::with_context($modulecontext)->get_data(['Test', 'Rubric']);
$data = (array) writer::with_context($modulecontext)->get_data(['Test', 'Rubric', $instanceid]);
$this->assertCount(2, $data);
$this->assertEquals('Spelling is important', $data['Spelling is important']->description);
$this->assertEquals('This user made several mistakes.', $data['Spelling is important']->remark);
grade/grading/tests/privacy_test.php
+2 -1
View File
@@ -296,9 +296,10 @@ class core_grading_privacy_testcase extends provider_testcase {
// Update this instance with data.
$instance->update($data);
$instanceid = $instance->get_data('id');
provider::export_item_data($modulecontext, $itemid, ['Test']);
$data = (array) writer::with_context($modulecontext)->get_data(['Test', 'Marking guide']);
$data = (array) writer::with_context($modulecontext)->get_data(['Test', 'Marking guide', $instanceid]);
$this->assertCount(2, $data);
$this->assertEquals('This user made several mistakes.', $data['Spelling mistakes']->remark);
$this->assertEquals(5, $data['Spelling mistakes']->score);