mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-73804-make-category-filter-context' of https://github.com/Peterburnett/moodle

Browse Source
This commit is contained in:
Víctor Déniz 2022-11-17 11:54:26 +00:00
commit dd1c227c8d
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
course/classes/category.php
View File

@ -2640,10 +2640,11 @@ class core_course_category implements renderable, cacheable_object, IteratorAggr
$thislist = array();
foreach ($rs as $record) {
context_helper::preload_from_record($record);
$context = context_coursecat::instance($record->id);
$canview = self::can_view_category($record);
$context = context_coursecat::instance($record->id);
$filtercontext = \context_helper::get_navigation_filter_context($context);
$baselist[$record->id] = array(
'name' => $canview ? format_string($record->name, true, array('context' => $context)) : false,
'name' => $canview ? format_string($record->name, true, array('context' => $filtercontext)) : false,
'path' => $record->path
);
if (!$canview || (!empty($requiredcapability) && !has_all_capabilities($requiredcapability, $context))) {

43
course/tests/category_test.php
View File

@ -1344,4 +1344,47 @@ class category_test extends \advanced_testcase {
],
];
}
/**
* This test ensures that the filter context list is populated by the correct filter contexts from make_category_list.
*
* @coversNothing
*/
public function test_make_category_list_context() {
global $DB;
// Ensure that the category list is empty.
$DB->delete_records('course_categories');
set_config('perfdebug', 15);
// Create a few categories to populate the context cache.
$this->getDataGenerator()->create_category(['name' => 'cat1']);
$this->getDataGenerator()->create_category(['name' => 'cat2']);
$this->getDataGenerator()->create_category(['name' => 'cat3']);
$filtermanager = \filter_manager::instance();
// Configure a filter to apply to all content and headings.
filter_set_global_state('multilang', TEXTFILTER_ON);
filter_set_applies_to_strings('multilang', true);
$perf = $filtermanager->get_performance_summary();
$this->assertEquals(0, $perf[0]['contextswithfilters']);
// Now fill the cache with the category strings.
\core_course_category::make_categories_list();
// 3 Categories + system context.
$perf = $filtermanager->get_performance_summary();
$this->assertEquals(3, $perf[0]['contextswithfilters']);
$filtermanager->reset_caches();
// We need to refresh the instance, resetting caches unloads the singleton.
$filtermanager = \filter_manager::instance();
\cache_helper::purge_by_definition('core', 'coursecat');
// Now flip the bit on the filter context.
set_config('filternavigationwithsystemcontext', 1);
// Repeat the check. Only context should be system context.
\core_course_category::make_categories_list();
$perf = $filtermanager->get_performance_summary();
$this->assertEquals(1, $perf[0]['contextswithfilters']);
}
}