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

Merge branch 'MDL-67732-38' of https://github.com/paulholden/moodle into MOODLE_38_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2020-02-05 20:05:41 +01:00
parent ff3b9e1afa c3496f8599
commit c58d4d4591
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
group/autogroup.php
+2 -2
View File
@@ -171,7 +171,7 @@ if ($editform->is_cancelled()) {
$table->width = '90%';
}
$table->data = array();
$viewfullnames = has_capability('moodle/site:viewfullnames', $context);
foreach ($groups as $group) {
$line = array();
if (groups_get_group_by_name($courseid, $group['name'])) {
@@ -183,7 +183,7 @@ if ($editform->is_cancelled()) {
if ($data->allocateby != 'no') {
$unames = array();
foreach ($group['members'] as $user) {
$unames[] = fullname($user, true);
$unames[] = fullname($user, $viewfullnames);
}
$line[] = implode(', ', $unames);
$line[] = count($group['members']);
group/classes/output/user_groups_editable.php
+4 -2
View File
@@ -77,8 +77,10 @@ class user_groups_editable extends \core\output\inplace_editable {
foreach ($coursegroups as $group) {
$options[$group->id] = format_string($group->name, true, ['context' => $this->context]);
}
$this->edithint = get_string('editusersgroupsa', 'group', fullname($user));
$this->editlabel = get_string('editusersgroupsa', 'group', fullname($user));
$fullname = fullname($user, has_capability('moodle/site:viewfullnames', $this->context));
$this->edithint = get_string('editusersgroupsa', 'group', $fullname);
$this->editlabel = get_string('editusersgroupsa', 'group', $fullname);
$attributes = ['multiple' => true];
$this->set_type_autocomplete($options, $attributes);
group/externallib.php
+2 -1
View File
@@ -556,7 +556,8 @@ class core_group_external extends external_api {
require_capability('moodle/course:managegroups', $context);
if (!groups_remove_member_allowed($group, $user)) {
throw new moodle_exception('errorremovenotpermitted', 'group', '', fullname($user));
$fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
throw new moodle_exception('errorremovenotpermitted', 'group', '', $fullname);
}
groups_remove_member($group, $user);
}
group/index.php
+8 -2
View File
@@ -81,6 +81,9 @@ switch ($action) {
case 'ajax_getmembersingroup':
$roles = array();
if ($groupmemberroles = groups_get_members_by_role($groupids[0], $courseid, 'u.id, ' . get_all_user_name_fields(true, 'u'))) {
$viewfullnames = has_capability('moodle/site:viewfullnames', $context);
foreach($groupmemberroles as $roleid=>$roledata) {
$shortroledata = new stdClass();
$shortroledata->name = $roledata->name;
@@ -88,7 +91,7 @@ switch ($action) {
foreach($roledata->users as $member) {
$shortmember = new stdClass();
$shortmember->id = $member->id;
$shortmember->name = fullname($member, true);
$shortmember->name = fullname($member, $viewfullnames);
$shortroledata->users[] = $shortmember;
}
$roles[] = $shortroledata;
@@ -190,12 +193,15 @@ $members = array();
if ($singlegroup) {
$usernamefields = get_all_user_name_fields(true, 'u');
if ($groupmemberroles = groups_get_members_by_role(reset($groupids), $courseid, 'u.id, ' . $usernamefields)) {
$viewfullnames = has_capability('moodle/site:viewfullnames', $context);
foreach ($groupmemberroles as $roleid => $roledata) {
$users = array();
foreach ($roledata->users as $member) {
$users[] = (object)[
'value' => $member->id,
'text' => fullname($member, true)
'text' => fullname($member, $viewfullnames)
];
}
$members[] = (object)[
group/overview.php
+3 -1
View File
@@ -248,9 +248,11 @@ foreach ($members as $gpgid=>$groupdata) {
$line[] = html_writer::tag('span', $name, array('class' => 'group_hoverdescription', 'data-groupid' => $gpid));
$hoverevents[$gpid] = get_string('descriptiona', null, $jsdescription);
}
$viewfullnames = has_capability('moodle/site:viewfullnames', $context);
$fullnames = array();
foreach ($users as $user) {
$fullnames[] = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$course->id.'">'.fullname($user, true).'</a>';
$fullnames[] = html_writer::link(new moodle_url('/user/view.php', ['id' => $user->id, 'course' => $course->id]),
fullname($user, $viewfullnames));
}
$line[] = implode(', ', $fullnames);
$line[] = count($users);