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

Author: ywarnier

.github/workflows/php_cs.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.2']
+        php-versions: ['7.4']
 
     steps:
       - name: Checkout

.travis.yml

@@ -18,9 +18,7 @@ cache:
   directories:
     - $HOME/.composer/cache/files
 php:
-  - 7.1
-  - 7.2
-  - 7.3
+  - 7.4
 
 env:
   global:

main/session/add_users_to_session.php

@@ -93,6 +93,15 @@
     $result = Database::query($sql);
     $users = [];
     while ($row = Database::fetch_assoc($result)) {
+        $row['complete_name_with_username'] = api_get_person_name(
+            $row['firstname'],
+            $row['lastname'],
+            null,
+            null,
+            null,
+            $row['username']
+        );
+        $row['complete_name_with_username'] .= ' ('.$row['username'].')';
         $users[] = $row;
     }
 
@@ -365,7 +374,7 @@ function showLastTenUsers() {
             var select = document.getElementById("origin_users");
             select.innerHTML = "";
             $.each(data, function(index, user) {
-                select.append(new Option(user.username + " - " + user.firstname + " " + user.lastname, user.id));
+                select.append(new Option(user.complete_name_with_username, user.id));
             });
         }, "json").fail(function(xhr, status, error) {
             console.error("Error en la solicitud AJAX: " + error);
@@ -397,7 +406,7 @@ function loadAllUsers() {
             select.innerHTML = "";
 
             $.each(data, function(index, user) {
-                select.append(new Option(user.username + " - " + user.firstname + " " + user.lastname, user.id));
+                select.append(new Option(user.complete_name_with_username, user.id));
             });
         }, "json").fail(function(xhr, status, error) {
             console.error("Error en la solicitud AJAX: " + error);

tests/behat/features/sessionAccess.feature

@@ -17,6 +17,7 @@ Feature: Session access
     Then I should see "Update successful"
     Then I should see "Subscribe users to this session"
     Then I follow "Multiple registration"
+    Then wait for the page to be loaded
     Then I select "Warnier Yannick (ywarnier)" from "nosessionUsersList[]"
     And I press "add_user"
     And I press "next"