From 598fa036468283fcc6c57923cf24be7eab63407d Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Fri, 14 Nov 2014 21:13:52 -0800 Subject: [PATCH] MDL-35494 core_backup: fixed activity restoration issue --- backup/util/ui/renderer.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backup/util/ui/renderer.php b/backup/util/ui/renderer.php index e705270587c81..98ed652d360e4 100644 --- a/backup/util/ui/renderer.php +++ b/backup/util/ui/renderer.php @@ -301,6 +301,11 @@ public function course_selector(moodle_url $nextstageurl, $wholecourse = true, r $html .= html_writer::end_tag('form'); } + // If we are restoring an activity, then include the current course. + if (!$wholecourse) { + $courses->invalidate_results(); // Clean list of courses. + $courses->set_include_currentcourse(); + } if (!empty($courses) && ($courses->get_count() > 0 || $courses->get_search())) { // Existing course $hasrestoreoption = true; @@ -311,10 +316,7 @@ public function course_selector(moodle_url $nextstageurl, $wholecourse = true, r $html .= $this->backup_detail_input(get_string('restoretoexistingcourseadding', 'backup'), 'radio', 'target', backup::TARGET_EXISTING_ADDING, array('checked'=>'checked')); $html .= $this->backup_detail_input(get_string('restoretoexistingcoursedeleting', 'backup'), 'radio', 'target', backup::TARGET_EXISTING_DELETING); } else { - // We only allow restore adding to existing for now. Enforce it here. $html .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'target', 'value'=>backup::TARGET_EXISTING_ADDING)); - $courses->invalidate_results(); // Clean list of courses - $courses->set_include_currentcourse(); // Show current course in the list } $selectacoursehtml = $this->backup_detail_pair(get_string('selectacourse', 'backup'), $this->render($courses)); // Display the course selection as required if the form was submitted but this data was not supplied.