fix eexception in user and group bulk editor
authorKatja Luther <k.luther@bgbm.org>
Mon, 2 Jul 2018 10:20:53 +0000 (12:20 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 4 Jul 2018 11:09:09 +0000 (13:09 +0200)
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java

index 350a50c890376a7087846f9f8dcea7a258104b06..706eed8f4b7c3b74f2e8e5467c2789189bf86711 100644 (file)
@@ -20,6 +20,8 @@ import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurato
 import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.Group;
+import eu.etaxonomy.cdm.persistence.query.OrderHint;
+import eu.etaxonomy.cdm.persistence.query.OrderHint.SortOrder;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
 import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.GroupCreator;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -79,6 +81,7 @@ public class GroupEditorInput extends AbstractBulkEditorInput<Group> {
        @Override
        protected List<Group> listEntities(
                        IIdentifiableEntityServiceConfigurator configurator) {
+           configurator.setOrderHints(new OrderHint("name", SortOrder.ASCENDING).asList());
                return CdmStore.getSearchManager().findGroups(configurator);
        }
 
index 05bab91f95218ce652cc4fd92a8a8875e1bec755..e00ad33f6591c0238f692b11a25970c15189f057 100644 (file)
@@ -18,6 +18,8 @@ import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
 import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.cdm.persistence.query.OrderHint;
+import eu.etaxonomy.cdm.persistence.query.OrderHint.SortOrder;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
 import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.UserCreator;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -76,6 +78,7 @@ public class UserEditorInput extends AbstractBulkEditorInput<User> {
        @Override
        protected List<User> listEntities(
                        IIdentifiableEntityServiceConfigurator configurator) {
+           configurator.setOrderHints(new OrderHint("username", SortOrder.ASCENDING).asList());
                return CdmStore.getSearchManager().findUsers(configurator);
        }