Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 40987: Notify list swaps users when display name matches email #6170

Merged
merged 1 commit into from
Dec 23, 2024
Merged

Issue 40987: Notify list swaps users when display name matches email #6170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions api/src/org/labkey/api/security/UserManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,10 +1181,16 @@ public static List<String> parseUserListInput(Set<String> theList)
{
if (null == (name = StringUtils.trimToNull(name)))
continue;
User u = null;
try { u = getUser(new ValidEmail(name)); } catch (ValidEmail.InvalidEmailException ignored) {}
if (null == u)
u = getUserByDisplayName(name);
// First try by display name. See issue 40987
User u = getUserByDisplayName(name);
if (u == null)
{
try
{
u = getUser(new ValidEmail(name));
}
catch (ValidEmail.InvalidEmailException ignored) {}
}
parsed.add(null == u ? name : String.valueOf(u.getUserId()));
}
return parsed;
Expand Down
Loading