enrol-users MDL-24618 Enrol users search now concats firstname and lastname as requested and searches email.

This commit is contained in:
Sam Hemelryk
2010-11-11 01:49:58 +00:00
parent 33d34b4b77
commit 9fc9de91be
2 changed files with 5 additions and 2 deletions
+1 -1
View File
@@ -126,7 +126,7 @@ switch ($action) {
$enrolid = required_param('enrolid', PARAM_INT);
$search = optional_param('search', '', PARAM_RAW);
$page = optional_param('page', 0, PARAM_INT);
$outcome->response = $manager->get_potential_users($enrolid, $search, false, $page);
$outcome->response = $manager->get_potential_users($enrolid, $search, true, $page);
foreach ($outcome->response['users'] as &$user) {
$user->picture = $OUTPUT->user_picture($user);
$user->fullname = fullname($user);
+4 -1
View File
@@ -263,7 +263,10 @@ class course_enrolment_manager {
$tests = array("id <> :guestid", 'u.deleted = 0', 'u.confirmed = 1');
$params = array('guestid' => $CFG->siteguest);
if (!empty($search)) {
$conditions = array('u.firstname','u.lastname');
$conditions = array(
$DB->sql_concat('u.firstname', "' '", 'u.lastname'),
'u.email'
);
if ($searchanywhere) {
$searchparam = '%' . $search . '%';
} else {