Merge branch 'MDL-46017-master' of git://github.com/damyon/moodle

moodle · Jul 23, 2014 · 1911cf3 · 1911cf3
2 parents 6b78b55 + 2fef6e7
commit 1911cf3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/mod/assign/backup/moodle2/backup_assign_stepslib.php b/mod/assign/backup/moodle2/backup_assign_stepslib.php
@@ -140,6 +140,7 @@ protected function define_structure() {
 
         // 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');

diff --git a/mod/assign/backup/moodle2/restore_assign_stepslib.php b/mod/assign/backup/moodle2/restore_assign_stepslib.php
@@ -54,6 +54,9 @@ protected function define_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 @@ protected function process_assign_submission($data) {
      * @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 @@ protected function process_assign_userflags($data) {
         $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 @@ protected function process_assign_grade($data) {
         $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);
-        }
-        if (!empty($data->mailed)) {
-            $flags->mailed = $data->mailed;
-        }
-        if (!empty($data->locked)) {
-            $flags->locked = $data->locked;
+        // 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);
         }
-        $DB->insert_record('assign_user_flags', $flags);
 
         $newitemid = $DB->insert_record('assign_grades', $data);