Skip to content

Commit e341d5d

Browse files
committed
Session: Fix users name displayed in list + test to create session
1 parent 2edd604 commit e341d5d

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

main/session/add_users_to_session.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,15 @@
9393
$result = Database::query($sql);
9494
$users = [];
9595
while ($row = Database::fetch_assoc($result)) {
96+
$row['complete_name_with_username'] = api_get_person_name(
97+
$row['firstname'],
98+
$row['lastname'],
99+
null,
100+
null,
101+
null,
102+
$row['username']
103+
);
104+
$row['complete_name_with_username'] .= ' ('.$row['username'].')';
96105
$users[] = $row;
97106
}
98107

@@ -365,7 +374,7 @@ function showLastTenUsers() {
365374
var select = document.getElementById("origin_users");
366375
select.innerHTML = "";
367376
$.each(data, function(index, user) {
368-
select.append(new Option(user.username + " - " + user.firstname + " " + user.lastname, user.id));
377+
select.append(new Option(user.complete_name_with_username, user.id));
369378
});
370379
}, "json").fail(function(xhr, status, error) {
371380
console.error("Error en la solicitud AJAX: " + error);
@@ -397,7 +406,7 @@ function loadAllUsers() {
397406
select.innerHTML = "";
398407
399408
$.each(data, function(index, user) {
400-
select.append(new Option(user.username + " - " + user.firstname + " " + user.lastname, user.id));
409+
select.append(new Option(user.complete_name_with_username, user.id));
401410
});
402411
}, "json").fail(function(xhr, status, error) {
403412
console.error("Error en la solicitud AJAX: " + error);

tests/behat/features/sessionAccess.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Feature: Session access
1717
Then I should see "Update successful"
1818
Then I should see "Subscribe users to this session"
1919
Then I follow "Multiple registration"
20+
Then wait for the page to be loaded
2021
Then I select "Warnier Yannick (ywarnier)" from "nosessionUsersList[]"
2122
And I press "add_user"
2223
And I press "next"

0 commit comments

Comments
 (0)