mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity

MDL-62707 search: account for no matching courses when listing areas.

Browse Source 
When limiting the list of courses during retrieval of the search areas
the user can access, make sure we have some contexts before looking
for blocks.
This commit is contained in:
Paul Holden 2020-02-04 08:19:02 +00:00
parent 7fa836cf36
commit e7e62a4b2e
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
search/classes/manager.php
View File

@ -823,8 +823,8 @@ class manager {
}
}
// Add all supported block contexts, in a single query for performance.
if (!empty($areasbylevel[CONTEXT_BLOCK])) {
// Add all supported block contexts for course contexts that user can access, in a single query for performance.
if (!empty($areasbylevel[CONTEXT_BLOCK]) && !empty($coursecontextids)) {
// Get list of all block types we care about.
$blocklist = [];
foreach ($areasbylevel[CONTEXT_BLOCK] as $areaid => $searchclass) {

38
search/tests/manager_test.php
View File

@ -791,7 +791,6 @@ class search_manager_testcase extends advanced_testcase {
$this->assertEquals($contexts['block_html-content'], $limitedcontexts['block_html-content']);
// Get block context ids for the blocks that appear.
global $DB;
$blockcontextids = $DB->get_fieldset_sql('
SELECT x.id
FROM {block_instances} bi
@ -811,6 +810,43 @@ class search_manager_testcase extends advanced_testcase {
$this->assertCount(1, $contexts['block_html-content']);
}
/**
* Tests retrieval of users search areas when limiting to a course the user is not enrolled in
*/
public function test_search_users_accesses_limit_non_enrolled_course() {
global $DB;
$this->resetAfterTest();
$user = $this->getDataGenerator()->create_user();
$this->setUser($user);
$search = testable_core_search::instance();
$search->add_core_search_areas();
$course = $this->getDataGenerator()->create_course();
$context = context_course::instance($course->id);
// Limit courses to search to only those the user is enrolled in.
set_config('searchallavailablecourses', 0);
$usercontexts = $search->get_areas_user_accesses([$course->id])->usercontexts;
$this->assertNotEmpty($usercontexts);
$this->assertArrayNotHasKey('core_course-course', $usercontexts);
// This config ensures the search will also include courses the user can view.
set_config('searchallavailablecourses', 1);
// Allow "Authenticated user" role to view the course without being enrolled in it.
$userrole = $DB->get_record('role', ['shortname' => 'user'], '*', MUST_EXIST);
role_change_permission($userrole->id, $context, 'moodle/course:view', CAP_ALLOW);
$usercontexts = $search->get_areas_user_accesses([$course->id])->usercontexts;
$this->assertNotEmpty($usercontexts);
$this->assertArrayHasKey('core_course-course', $usercontexts);
$this->assertEquals($context->id, reset($usercontexts['core_course-course']));
}
/**
* Test get_areas_user_accesses with regard to the 'all available courses' config option.
*