Merge branch 'MDL-32499_master' of git://github.com/dmonllao/moodle

This commit is contained in:
Sam Hemelryk 2012-07-31 16:30:05 +12:00
commit 5adf3ec6cb
2 changed files with 11 additions and 3 deletions

View File

@ -106,8 +106,13 @@ class backup_gradingform_rubric_plugin extends backup_gradingform_plugin {
// Set sources to populate the data
$filling->set_source_table('gradingform_rubric_fillings',
array('instanceid' => backup::VAR_PARENTID));
// Binding criterionid to ensure it's existence
$filling->set_source_sql('SELECT rf.*
FROM {gradingform_rubric_fillings} rf
JOIN {grading_instances} gi ON gi.id = rf.instanceid
JOIN {gradingform_rubric_criteria} rc ON rc.id = rf.criterionid AND gi.definitionid = rc.definitionid
WHERE rf.instanceid = :instanceid',
array('instanceid' => backup::VAR_PARENTID));
// no need to annotate ids or files yet (one day when remark field supports
// embedded fileds, they must be annotated here)

View File

@ -109,6 +109,9 @@ class restore_gradingform_rubric_plugin extends restore_gradingform_plugin {
$data->criterionid = $this->get_mappingid('gradingform_rubric_criterion', $data->criterionid);
$data->levelid = $this->get_mappingid('gradingform_rubric_level', $data->levelid);
$DB->insert_record('gradingform_rubric_fillings', $data);
if (!empty($data->criterionid)) {
$DB->insert_record('gradingform_rubric_fillings', $data);
}
}
}