Skip to content
Snippets Groups Projects
Commit 3c1936a8 authored by srosse's avatar srosse
Browse files

OO-4794: don't search all users if login is an empty string

parent 4d7999ac
No related branches found
No related tags found
No related merge requests found
......@@ -29,6 +29,7 @@ import java.util.Map;
import org.olat.core.id.Identity;
import org.olat.core.id.Organisation;
import org.olat.core.id.OrganisationRef;
import org.olat.core.util.StringHelper;
import org.olat.modules.curriculum.CurriculumRoles;
/**
......@@ -77,7 +78,7 @@ public class SearchIdentityParams {
public SearchIdentityParams(String login, Map<String, String> userproperties, boolean userPropertiesAsIntersectionSearch,
OrganisationRoles[] roles, String[] authProviders,
Date createdAfter, Date createdBefore, Date userLoginAfter, Date userLoginBefore, Integer status) {
this.login = login;
setLogin(login);
this.userProperties = userproperties;
this.userPropertiesAsIntersectionSearch = userPropertiesAsIntersectionSearch;
this.roles = roles;
......@@ -160,7 +161,11 @@ public class SearchIdentityParams {
}
public void setLogin(String login) {
this.login = login;
if(StringHelper.containsNonWhitespace(login)) {
this.login = login;
} else {
this.login = null;
}
}
public String getSearchString() {
......@@ -168,7 +173,11 @@ public class SearchIdentityParams {
}
public void setSearchString(String searchString) {
this.searchString = searchString;
if(StringHelper.containsNonWhitespace(searchString)) {
this.searchString = searchString;
} else {
this.searchString = null;
}
}
public boolean hasUserProperties() {
......
......@@ -46,7 +46,7 @@ public class MembersWizardPage {
public MembersWizardPage nextUsers() {
OOGraphene.nextStep(browser);
OOGraphene.waitElement(By.cssSelector("fieldset.o_sel_user_import_overview"), 5, browser);
OOGraphene.waitElement(By.cssSelector("fieldset.o_sel_user_import_overview"), browser);
return this;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment