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

MDL-56509 tool_usertours: Fetch all role shortnames

Browse Source
This commit is contained in:
Andrew Nicols
2016-11-01 10:14:48 +08:00
parent a1f6a27c80
commit 41c1314fbd
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/usertours/classes/local/filter/role.php
+17 -1
View File
@@ -105,7 +105,11 @@ class role extends base {
return true;
}
// Use a request cache to save on DB queries.
// We may be checking multiple tours and they'll all be for the same userid, and contextid
$cache = \cache::make_from_params(\cache_store::MODE_REQUEST, 'tool_usertours', 'filter_role');
// Get all of the roles used in this context, including special roles such as user, and frontpageuser.
$cachekey = "{$USER->id}_{$context->id}";
$userroles = $cache->get($cachekey);
if ($userroles === false) {
@@ -113,8 +117,20 @@ class role extends base {
$cache->set($cachekey, $userroles);
}
// Some special roles do not include the shortname.
// Therefore we must fetch all roles too. Thankfully these don't actually change based on context.
// They do require a DB call, so let's cache it.
$cachekey = "allroles";
$allroles = $cache->get($cachekey);
if ($allroles === false) {
$allroles = get_all_roles();
$cache->set($cachekey, $allroles);
}
// Now we can check whether any of the user roles are in the list of allowed roles for this filter.
foreach ($userroles as $role) {
if (isset($values[$role->roleid])) {
$shortname = $allroles[$role->roleid]->shortname;
if (isset($values[$shortname])) {
return true;
}
}
admin/tool/usertours/tests/role_filter_test.php
+6 -6
View File
@@ -102,7 +102,7 @@ class tool_usertours_role_filter_testcase extends advanced_testcase {
$context = \context_course::instance($this->course->id);
$roles = [
$this->roles['student'],
'student',
];
// Note: No need to persist this tour.
@@ -131,8 +131,8 @@ class tool_usertours_role_filter_testcase extends advanced_testcase {
$context = \context_course::instance($this->course->id);
$roles = [
$this->roles['teacher'],
$this->roles['editingteacher'],
'teacher',
'editingteacher',
];
// Note: No need to persist this tour.
@@ -161,7 +161,7 @@ class tool_usertours_role_filter_testcase extends advanced_testcase {
$context = \context_course::instance($this->course->id);
$roles = [
$this->roles['student'],
'student',
];
$this->getDataGenerator()->enrol_user($this->student->id, $this->course->id, $this->roles['teacher']);
@@ -222,8 +222,8 @@ class tool_usertours_role_filter_testcase extends advanced_testcase {
$roles = [
\tool_usertours\local\filter\role::ROLE_SITEADMIN,
$this->roles['teacher'],
$this->roles['editingteacher'],
'teacher',
'editingteacher',
];
// Note: No need to persist this tour.