Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

pull/2487/head
Angel Fernando Quiroz Campos 8 years ago
commit ef97e440a1
  1. 13
      main/gradebook/search.php
  2. 2
      main/inc/lib/usermanager.lib.php

@ -30,8 +30,7 @@ $searchForm->addButtonSearch();
if ($searchForm->validate()) { if ($searchForm->validate()) {
$firstname = $searchForm->getSubmitValue('firstname'); $firstname = $searchForm->getSubmitValue('firstname');
$lastname = $searchForm->getSubmitValue('lastname'); $lastname = $searchForm->getSubmitValue('lastname');
$userList = UserManager::getUsersByName($firstname, $lastname);
$userList = UserManager::getUserByName($firstname, $lastname);
if (empty($userList)) { if (empty($userList)) {
Display::addFlash( Display::addFlash(
@ -54,12 +53,18 @@ if ($searchForm->validate()) {
} }
$courseList = GradebookUtils::getUserCertificatesInCourses($userId, false); $courseList = GradebookUtils::getUserCertificatesInCourses($userId, false);
$sessionList = GradebookUtils::getUserCertificatesInSessions($userId, false); $sessionList = GradebookUtils::getUserCertificatesInSessions(
$userId,
false
);
if (empty($courseList) && empty($sessionList)) { if (empty($courseList) && empty($sessionList)) {
Display::addFlash( Display::addFlash(
Display::return_message( Display::return_message(
sprintf(get_lang('TheUserXNotYetAchievedCertificates'), $userInfo['complete_name']), sprintf(
get_lang('TheUserXNotYetAchievedCertificates'),
$userInfo['complete_name']
),
'warning' 'warning'
) )
); );

@ -5231,7 +5231,7 @@ class UserManager
* @param string $lastname Lastname to search * @param string $lastname Lastname to search
* @return array The user list * @return array The user list
*/ */
public static function getUserByName($firstname, $lastname) public static function getUsersByName($firstname, $lastname)
{ {
$firstname = Database::escape_string($firstname); $firstname = Database::escape_string($firstname);
$lastname = Database::escape_string($lastname); $lastname = Database::escape_string($lastname);

Loading…
Cancel
Save