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

Merge branch 'MDL-83272_404_STABLE' of https://github.com/marxjohnson/moodle into MOODLE_404_STABLE

Browse Source
This commit is contained in:
Huong Nguyen
2025-03-26 10:27:40 +07:00
parent 32547c0496 7742681329
commit 0733ed3db1
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/bank/managecategories/classes/helper.php
+1 -1
View File
@@ -324,7 +324,7 @@ class helper {
foreach ($categories as $category) {
if ($category->contextid == $contextid) {
$cid = $category->id;
if ($currentcat != $cid || $currentcat == 0) {
if ("{$currentcat},{$contextid}" != $cid || $currentcat == 0) {
$a = new \stdClass;
$a->name = format_string($category->indentedname, true,
['context' => $context]);
question/bank/managecategories/tests/helper_test.php
+33
View File
@@ -253,6 +253,39 @@ final class helper_test extends \advanced_testcase {
}
}
/**
* Test that question_category_options function does not include the current category.
*
* @covers ::question_category_options
*/
public function test_question_category_options_exclude_current(): void {
$this->setAdminUser();
$this->resetAfterTest();
// Create categories.
$qcategory1 = $this->qgenerator->create_question_category(['contextid' => $this->context->id]);
$qcategory2 = $this->qgenerator->create_question_category(['contextid' => $this->context->id, 'parent' => $qcategory1->id]);
$qcategory3 = $this->qgenerator->create_question_category(['contextid' => $this->context->id]);
$contexts = new \core_question\local\bank\question_edit_contexts($this->context);
$categorycontexts = helper::question_category_options($contexts->having_cap('moodle/question:add'));
// We get all categories without the currentcat parameter.
$categorycontext = $categorycontexts['Quiz: Quiz 1'];
$this->assertCount(3, $categorycontext);
// The currentcat category is excluded.
$newcategorycontexts = helper::question_category_options(
$contexts->having_cap('moodle/question:add'),
currentcat: $qcategory2->id,
);
$newcategorycontext = $newcategorycontexts['Quiz: Quiz 1'];
$this->assertCount(2, $newcategorycontext);
$this->assertContains($qcategory1->name, $newcategorycontext);
$this->assertNotContains($qcategory2->name, $newcategorycontext);
$this->assertContains($qcategory3->name, $newcategorycontext);
}
/**
* Test that get_categories_for_contexts function returns the correct question count number.
*