MDL-35421 Support the new conclusion field in backup and restore

diff --git a/mod/workshop/backup/moodle1/lib.php b/mod/workshop/backup/moodle1/lib.php
index 8dc55ec..4405280 100644 (file)
--- a/mod/workshop/backup/moodle1/lib.php
+++ b/mod/workshop/backup/moodle1/lib.php
@@ -105,6 +105,8 @@ class moodle1_mod_workshop_handler extends moodle1_mod_handler {
         $this->currentworkshop['instructreviewers']         = '';
         $this->currentworkshop['instructreviewersformat']   = FORMAT_HTML;
         $this->currentworkshop['latesubmissions']           = 0;
+        $this->currentworkshop['conclusion']                = '';
+        $this->currentworkshop['conclusionformat']          = FORMAT_HTML;
 
         foreach (array('submissionend', 'submissionstart', 'assessmentend', 'assessmentstart') as $field) {
             if (!array_key_exists($field, $this->currentworkshop)) {

diff --git a/mod/workshop/backup/moodle2/backup_workshop_stepslib.php b/mod/workshop/backup/moodle2/backup_workshop_stepslib.php
index 26e6adf..7f194fb 100644 (file)
--- a/mod/workshop/backup/moodle2/backup_workshop_stepslib.php
+++ b/mod/workshop/backup/moodle2/backup_workshop_stepslib.php
@@ -55,7 +55,8 @@ class backup_workshop_activity_structure_step extends backup_activity_structure_
             'usepeerassessment', 'useselfassessment', 'grade', 'gradinggrade',
             'strategy', 'evaluation', 'gradedecimals', 'nattachments',
             'latesubmissions', 'maxbytes', 'examplesmode', 'submissionstart',
-            'submissionend', 'assessmentstart', 'assessmentend'));
+            'submissionend', 'assessmentstart', 'assessmentend',
+            'conclusion', 'conclusionformat'));
 
         // assessment forms definition
         $this->add_subplugin_structure('workshopform', $workshop, true);
@@ -194,6 +195,7 @@ class backup_workshop_activity_structure_step extends backup_activity_structure_
         $workshop->annotate_files('mod_workshop', 'intro', null); // no itemid used
         $workshop->annotate_files('mod_workshop', 'instructauthors', null); // no itemid used
         $workshop->annotate_files('mod_workshop', 'instructreviewers', null); // no itemid used
+        $workshop->annotate_files('mod_workshop', 'conclusion', null); // no itemid used
 
         $examplesubmission->annotate_files('mod_workshop', 'submission_content', 'id');
         $examplesubmission->annotate_files('mod_workshop', 'submission_attachment', 'id');

diff --git a/mod/workshop/backup/moodle2/restore_workshop_activity_task.class.php b/mod/workshop/backup/moodle2/restore_workshop_activity_task.class.php
index 1f942f7..eadb6a9 100644 (file)
--- a/mod/workshop/backup/moodle2/restore_workshop_activity_task.class.php
+++ b/mod/workshop/backup/moodle2/restore_workshop_activity_task.class.php
@@ -55,7 +55,7 @@ class restore_workshop_activity_task extends restore_activity_task {
         $contents = array();
 
         $contents[] = new restore_decode_content('workshop',
-                          array('intro', 'instructauthors', 'instructreviewers'), 'workshop');
+                          array('intro', 'instructauthors', 'instructreviewers', 'conclusion'), 'workshop');
         $contents[] = new restore_decode_content('workshop_submissions',
                           array('content', 'feedbackauthor'), 'workshop_submission');
         $contents[] = new restore_decode_content('workshop_assessments',

diff --git a/mod/workshop/backup/moodle2/restore_workshop_stepslib.php b/mod/workshop/backup/moodle2/restore_workshop_stepslib.php
index dae7706..616bed8 100644 (file)
--- a/mod/workshop/backup/moodle2/restore_workshop_stepslib.php
+++ b/mod/workshop/backup/moodle2/restore_workshop_stepslib.php
@@ -212,6 +212,7 @@ class restore_workshop_activity_structure_step extends restore_activity_structur
         $this->add_related_files('mod_workshop', 'intro', null);
         $this->add_related_files('mod_workshop', 'instructauthors', null);
         $this->add_related_files('mod_workshop', 'instructreviewers', null);
+        $this->add_related_files('mod_workshop', 'conclusion', null);
 
         // Add example submission related files, matching by 'workshop_examplesubmission' itemname
         $this->add_related_files('mod_workshop', 'submission_content', 'workshop_examplesubmission');