Fixes #2285 and #2286

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
index f3f055a7b807a58224673a5a987236bc9ac51f70..572d5299d5e88a0b770ef3491fcd62c5ec0d4698 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
@@ -126,14 +126,12 @@ public class SearchManager {
        public List<User> findUsers(IIdentifiableEntityServiceConfigurator configurator){
                String userNameSearchString = configurator.getTitleSearchString().replace("*", "%");
                
-               // FIXME there is no search at the moment, we will return all users for starters
-               return CdmStore.getService(IUserService.class).list(User.class, null, null, null, null);
+               return CdmStore.getService(IUserService.class).listByUsername(userNameSearchString, null, null, null, null, null, null);
        }
        
        public List<Group> findGroups(IIdentifiableEntityServiceConfigurator configurator){
                String groupNameSearchString = configurator.getTitleSearchString().replace("*", "%");
                
-               // FIXME there is no search at the moment, we will return all users for starters
-               return CdmStore.getService(IGroupService.class).list(Group.class, null, null, null, null);
+               return CdmStore.getService(IGroupService.class).listByName(groupNameSearchString, null, null, null, null, null, null);
        }
 }