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

Merge branch 'MDL-46017-27' of git://github.com/damyon/moodle into MOODLE_27_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2014-07-23 08:24:26 +01:00
parent 6dc0b5482b 0086364857
commit 92d4bcd9f7
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/backup/moodle2/backup_assign_stepslib.php
+1
View File
@@ -140,6 +140,7 @@ class backup_assign_activity_structure_step extends backup_activity_structure_st
// Define id annotations.
$userflag->annotate_ids('user', 'userid');
$userflag->annotate_ids('user', 'allocatedmarker');
$submission->annotate_ids('user', 'userid');
$submission->annotate_ids('group', 'groupid');
$grade->annotate_ids('user', 'userid');
mod/assign/backup/moodle2/restore_assign_stepslib.php
+22 -13
View File
@@ -54,6 +54,9 @@ class restore_assign_activity_structure_step extends restore_activity_structure_
$grade = new restore_path_element('assign_grade', '/activity/assign/grades/grade');
$paths[] = $grade;
$this->add_subplugin_structure('assignfeedback', $grade);
$userflag = new restore_path_element('assign_userflag',
'/activity/assign/userflags/userflag');
$paths[] = $userflag;
}
$paths[] = new restore_path_element('assign_plugin_config',
'/activity/assign/plugin_configs/plugin_config');
@@ -145,7 +148,7 @@ class restore_assign_activity_structure_step extends restore_activity_structure_
* @param object $data The data in object form
* @return void
*/
protected function process_assign_userflags($data) {
protected function process_assign_userflag($data) {
global $DB;
$data = (object)$data;
@@ -154,6 +157,7 @@ class restore_assign_activity_structure_step extends restore_activity_structure_
$data->assignment = $this->get_new_parentid('assign');
$data->userid = $this->get_mappingid('user', $data->userid);
$data->allocatedmarker = $this->get_mappingid('user', $data->allocatedmarker);
if (!empty($data->extensionduedate)) {
$data->extensionduedate = $this->apply_date_offset($data->extensionduedate);
} else {
@@ -182,19 +186,24 @@ class restore_assign_activity_structure_step extends restore_activity_structure_
$data->userid = $this->get_mappingid('user', $data->userid);
$data->grader = $this->get_mappingid('user', $data->grader);
// Handle flags restore to a different table.
$flags = new stdClass();
$flags->assignment = $this->get_new_parentid('assign');
if (!empty($data->extensionduedate)) {
$flags->extensionduedate = $this->apply_date_offset($data->extensionduedate);
// Handle flags restore to a different table (for upgrade from old backups).
if (!empty($data->extensionduedate) ||
!empty($data->mailed) ||
!empty($data->locked)) {
$flags = new stdClass();
$flags->assignment = $this->get_new_parentid('assign');
if (!empty($data->extensionduedate)) {
$flags->extensionduedate = $this->apply_date_offset($data->extensionduedate);
}
if (!empty($data->mailed)) {
$flags->mailed = $data->mailed;
}
if (!empty($data->locked)) {
$flags->locked = $data->locked;
}
$flags->userid = $this->get_mappingid('user', $data->userid);
$DB->insert_record('assign_user_flags', $flags);
}
if (!empty($data->mailed)) {
$flags->mailed = $data->mailed;
}
if (!empty($data->locked)) {
$flags->locked = $data->locked;
}
$DB->insert_record('assign_user_flags', $flags);
$newitemid = $DB->insert_record('assign_grades', $data);