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

Merge branch 'MDL-84695-main' of https://github.com/lucaboesch/moodle into main

Browse Source
This commit is contained in:
Mihail Geshoski
2025-07-08 22:21:54 +08:00
parent 3cb07cf853 d4f89cd803
commit 5485e508e9
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/classes/local/bank/question_bank_helper.php
+5 -3
View File
@@ -529,11 +529,13 @@ class question_bank_helper {
$sql = "SELECT cm.id
FROM {course_modules} cm
JOIN {modules} m ON m.id = cm.module
JOIN {{$defaultyactivityname}} q ON q.id = cm.instance AND cm.module = m.id
JOIN {{$defaultyactivityname}} q ON q.id = cm.instance
WHERE cm.course = :course
AND q.type = :type";
AND q.type = :type
AND m.name = :modulename";
return $DB->get_fieldset_sql($sql, ['type' => $subtype, 'course' => $course->id]);
return $DB->get_fieldset_sql($sql, ['type' => $subtype, 'course' => $course->id,
'modulename' => $defaultyactivityname]);
}
return [];
question/tests/local/bank/question_bank_helper_test.php
+16
View File
@@ -407,6 +407,10 @@ final class question_bank_helper_test extends \advanced_testcase {
self::setAdminUser();
$course = self::getDataGenerator()->create_course();
// Create module other than a qbank.
$wiki = self::getDataGenerator()->create_module('wiki', [
'course' => $course->id,
]);
$modinfo = get_fast_modinfo($course);
$qbanks = $modinfo->get_instances_of('qbank');
$this->assertCount(0, $qbanks);
@@ -416,6 +420,18 @@ final class question_bank_helper_test extends \advanced_testcase {
$this->assertEquals(get_string('systembank', 'question'), $qbank->get_name());
$modrecord = $DB->get_record('qbank', ['id' => $qbank->instance]);
$this->assertEquals(question_bank_helper::TYPE_SYSTEM, $modrecord->type);
// Swap the qbank instance record for one with the same ID as the wiki instance.
$newqbank = clone($modrecord);
$newqbank->id = $wiki->id;
$DB->insert_record_raw('qbank', $newqbank, customsequence: true);
$DB->delete_records('qbank', ['id' => $qbank->id]);
$DB->set_field('course_modules', 'instance', $newqbank->id, ['instance' => $qbank->instance]);
// Retry the above again.
\course_modinfo::purge_course_caches([$course->id]);
$qbank = question_bank_helper::get_default_open_instance_system_type($course);
$this->assertEquals(get_string('systembank', 'question'), $qbank->get_name());
$modrecord = $DB->get_record('qbank', ['id' => $qbank->instance]);
$this->assertEquals(question_bank_helper::TYPE_SYSTEM, $modrecord->type);
}
/**