Merge branch 'release/5.28.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / group / MemberDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java
index c222568c9a2e0a9d11c8e2a7515211d2dda8c8a9..52f91b0d2bf6f041de9319612d57cf2a42292c9c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java
@@ -50,7 +50,10 @@ public class MemberDetailElement extends AbstractEntityCollectionElement<User> {
         */
        @Override
        public void setEntity(User entity) {
-               selection_user.setEntity(entity);
+               this.entity = entity;
+               if (selection_user!= null){
+                       selection_user.setEntity(entity);
+               }
        }
 
        /*
@@ -65,6 +68,9 @@ public class MemberDetailElement extends AbstractEntityCollectionElement<User> {
                                .createSelectionElement(User.class,//getConversationHolder(),
                                        element, "", entity,
                                                EntitySelectionElement.EDITABLE, style);
+               if (entity != null){
+                       setEntity(entity);
+               }
        }
 
        /*