mirror of
https://github.com/moodle/moodle.git
synced 2025-06-13 23:13:05 +02:00
MDL-38180 do not add links for enrol and other users candidates
This commit is contained in:
@ -96,9 +96,16 @@ switch ($action) {
|
|||||||
$page = optional_param('page', 0, PARAM_INT);
|
$page = optional_param('page', 0, PARAM_INT);
|
||||||
$outcome->response = $manager->search_other_users($search, $searchanywhere, $page);
|
$outcome->response = $manager->search_other_users($search, $searchanywhere, $page);
|
||||||
$extrafields = get_extra_user_fields($context);
|
$extrafields = get_extra_user_fields($context);
|
||||||
|
$useroptions = array();
|
||||||
|
// User is not enrolled, either link to site profile or do not link at all.
|
||||||
|
if (has_capability('moodle/user:viewdetails', context_system::instance())) {
|
||||||
|
$useroptions['courseid'] = SITEID;
|
||||||
|
} else {
|
||||||
|
$useroptions['link'] = false;
|
||||||
|
}
|
||||||
foreach ($outcome->response['users'] as &$user) {
|
foreach ($outcome->response['users'] as &$user) {
|
||||||
$user->userId = $user->id;
|
$user->userId = $user->id;
|
||||||
$user->picture = $OUTPUT->user_picture($user);
|
$user->picture = $OUTPUT->user_picture($user, $useroptions);
|
||||||
$user->fullname = fullname($user);
|
$user->fullname = fullname($user);
|
||||||
$fieldvalues = array();
|
$fieldvalues = array();
|
||||||
foreach ($extrafields as $field) {
|
foreach ($extrafields as $field) {
|
||||||
|
@ -71,8 +71,15 @@ switch ($action) {
|
|||||||
$perpage = optional_param('perpage', 25, PARAM_INT); // This value is hard-coded to 25 in quickenrolment.js
|
$perpage = optional_param('perpage', 25, PARAM_INT); // This value is hard-coded to 25 in quickenrolment.js
|
||||||
$outcome->response = $manager->get_potential_users($enrolid, $search, $searchanywhere, $page, $perpage, $addedenrollment);
|
$outcome->response = $manager->get_potential_users($enrolid, $search, $searchanywhere, $page, $perpage, $addedenrollment);
|
||||||
$extrafields = get_extra_user_fields($context);
|
$extrafields = get_extra_user_fields($context);
|
||||||
|
$useroptions = array();
|
||||||
|
// User is not enrolled yet, either link to site profile or do not link at all.
|
||||||
|
if (has_capability('moodle/user:viewdetails', context_system::instance())) {
|
||||||
|
$useroptions['courseid'] = SITEID;
|
||||||
|
} else {
|
||||||
|
$useroptions['link'] = false;
|
||||||
|
}
|
||||||
foreach ($outcome->response['users'] as &$user) {
|
foreach ($outcome->response['users'] as &$user) {
|
||||||
$user->picture = $OUTPUT->user_picture($user);
|
$user->picture = $OUTPUT->user_picture($user, $useroptions);
|
||||||
$user->fullname = fullname($user);
|
$user->fullname = fullname($user);
|
||||||
$fieldvalues = array();
|
$fieldvalues = array();
|
||||||
foreach ($extrafields as $field) {
|
foreach ($extrafields as $field) {
|
||||||
|
Reference in New Issue
Block a user