mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-08 01:43:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-62440' of git://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Jake Dallimore 2018-05-21 14:55:16 +08:00
commit ed00590ad8
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/accesslib.php
View File

@ -2702,6 +2702,10 @@ function get_archetype_roles($archetype) {
/**
* Gets all the user roles assigned in this context, or higher contexts for a list of users.
*
* If you try using the combination $userids = [], $checkparentcontexts = true then this is likely
* to cause an out-of-memory error on large Moodle sites, so this combination is deprecated and
* outputs a warning, even though it is the default.
*
* @param context $context
* @param array $userids. An empty list means fetch all role assignments for the context.
* @param bool $checkparentcontexts defaults to true
@ -2709,7 +2713,13 @@ function get_archetype_roles($archetype) {
* @return array
*/
function get_users_roles(context $context, $userids = [], $checkparentcontexts = true, $order = 'c.contextlevel DESC, r.sortorder ASC') {
global $USER, $DB;
global $DB;
if (!$userids && $checkparentcontexts) {
debugging('Please do not call get_users_roles() with $checkparentcontexts = true ' .
'and $userids array not set. This combination causes large Moodle sites ' .
'with lots of site-wide role assignemnts to run out of memory.', DEBUG_DEVELOPER);
}
if ($checkparentcontexts) {
$contextids = $context->get_parent_context_ids();

2
lib/tests/accesslib_test.php
View File

@ -1721,7 +1721,7 @@ class core_accesslib_testcase extends advanced_testcase {
$u2roles = get_user_roles($coursecontext, $user2->id);
$allroles = get_users_roles($coursecontext);
$allroles = get_users_roles($coursecontext, [], false);
$specificuserroles = get_users_roles($coursecontext, [$user1->id, $user2->id]);
$this->assertEquals($u1roles, $allroles[$user1->id]);
$this->assertEquals($u1roles, $specificuserroles[$user1->id]);

15
user/classes/participants_table.php
View File

@ -236,7 +236,6 @@ class participants_table extends \table_sql {
$this->groups = groups_get_all_groups($courseid, 0, 0, 'g.*', true);
}
$this->allroles = role_fix_names(get_all_roles($this->context), $this->context);
$this->allroleassignments = get_users_roles($this->context, [], true, 'c.contextlevel DESC, r.sortorder ASC');
$this->assignableroles = get_assignable_roles($this->context, ROLENAME_ALIAS, false);
$this->profileroles = get_profile_roles($this->context);
$this->viewableroles = get_viewable_roles($this->context);
@ -446,9 +445,21 @@ class participants_table extends \table_sql {
$sort = 'ORDER BY ' . $sort;
}
$this->rawdata = user_get_participants($this->course->id, $this->currentgroup, $this->accesssince,
$rawdata = user_get_participants($this->course->id, $this->currentgroup, $this->accesssince,
$this->roleid, $this->enrolid, $this->status, $this->search, $twhere, $tparams, $sort, $this->get_page_start(),
$this->get_page_size());
$this->rawdata = [];
foreach ($rawdata as $user) {
$this->rawdata[$user->id] = $user;
}
$rawdata->close();
if ($this->rawdata) {
$this->allroleassignments = get_users_roles($this->context, array_keys($this->rawdata),
true, 'c.contextlevel DESC, r.sortorder ASC');
} else {
$this->allroleassignments = [];
}
// Set initial bars.
if ($useinitialsbar) {