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

Merge branch 'MDL-86300-500' of https://github.com/sh-csg/moodle into MOODLE_500_STABLE

Browse Source
This commit is contained in:
Mihail Geshoski
2025-10-08 13:27:22 +08:00
parent d2269b1a8b 91e676ebde
commit 0f2443cddb
2 changed files with 66 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/moodle2/restore_stepslib.php
+1 -1
View File
@@ -5553,7 +5553,7 @@ class restore_move_module_questions_categories extends restore_execution_step {
// From 3.5 onwards, all question categories should be a child of a special category called the "top" category.
$info = backup_controller_dbops::decode_backup_temp_info($modulecat->info);
if ($after35 && empty($info->parent)) {
$oldtopid = $modulecat->newitemid;
$oldtopid = $modulecat->itemid;
$modulecat->newitemid = $top->id;
} else {
$cat = new stdClass();
backup/moodle2/tests/moodle2_test.php
+65 -1
View File
@@ -1088,14 +1088,78 @@ final class moodle2_test extends \advanced_testcase {
}
}
// Make sure there is a single top level category in this context.
// Make sure there is a single top level category in this context and that the parents are set correctly.
if ($cats) {
$this->assertEquals(1, $topcategorycount[$context->id]);
$topcat = array_values($cats)[0];
$this->assertEquals(0, $topcat->parent);
$othercat = array_values($cats)[1];
$this->assertEquals($topcat->id, $othercat->parent);
}
}
}
}
/**
* Check that the backup/restore process correctly wires the question categories, see MDL-86300.
* @covers \restore_move_module_questions_categories::define_execution
*/
public function test_restore_question_categories_from_500(): void {
global $DB, $CFG, $USER;
$this->resetAfterTest(true);
$this->setAdminUser();
// Create a course.
$generator = $this->getDataGenerator();
$questiongenerator = $this->getDataGenerator()->get_plugin_generator('core_question');
$course = $generator->create_course();
// Add a quiz with question categories.
$quiz = $generator->create_module('quiz', ['course' => $course->id]);
$quizcontext = \context_module::instance($quiz->cmid);
$questiongenerator->create_question_category(['contextid' => $quizcontext->id]);
$quizquestioncats = $DB->get_records('question_categories', ['contextid' => $quizcontext->id]);
$this->assertCount(3, $quizquestioncats);
// Add a question bank with question categories.
$qbank = $this->getDataGenerator()->create_module('qbank', ['course' => $course->id]);
$qbankcontext = \context_module::instance($qbank->cmid);
$questiongenerator->create_question_category(['contextid' => $qbankcontext->id]);
$qbankquestioncats = $DB->get_records('question_categories', ['contextid' => $qbankcontext->id]);
$this->assertCount(3, $qbankquestioncats);
$targetcourseid = $this->backup_and_restore($course);
// Check the quiz and qbank question categories in the target course, in particular the parent relationship.
$modinfo = get_fast_modinfo($targetcourseid);
$targetquizzes = $modinfo->get_instances_of('quiz');
$this->assertCount(1, $targetquizzes);
$targetquiz = reset($targetquizzes);
$targetquizcontext = \context_module::instance($targetquiz->id);
$targetquizcats = array_values(
$DB->get_records('question_categories', ['contextid' => $targetquizcontext->id], 'parent', 'id, name, parent')
);
$this->assertCount(3, $targetquizcats);
$quiztop = $targetquizcats[0];
$this->assertEquals(0, $quiztop->parent);
$quiznontop = $targetquizcats[1];
$this->assertEquals($quiztop->id, $quiznontop->parent);
$targetqbanks = $modinfo->get_instances_of('qbank');
$this->assertCount(1, $targetqbanks);
$targetqbankcontext = \context_module::instance(reset($targetqbanks)->id);
$targetqbankcats = array_values(
$DB->get_records('question_categories', ['contextid' => $targetqbankcontext->id], 'parent', 'id, name, parent')
);
$this->assertCount(3, $targetqbankcats);
$qbanktop = $targetqbankcats[0];
$this->assertEquals(0, $qbanktop->parent);
$qbanknontop = $targetqbankcats[1];
$this->assertEquals($qbanktop->id, $qbanknontop->parent);
}
/**
* Test the content bank content through a backup and restore.
*/