Fixes #2413

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java
index 83b8e3a6ee6719f85ccc977d1e71652918d58010..60dc85c60e7506e72b90f018177e9a9ee349e4a4 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java
@@ -7,6 +7,7 @@ import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;

+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;

 import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;


@@ -109,6 +110,7 @@ public class UserDetailElement extends AbstractCdmDetailElement<User> {
                        getEntity().setCredentialsNonExpired(
                                        checkbox_credentialsNonExpired.getSelection());
                }
                        getEntity().setCredentialsNonExpired(
                                        checkbox_credentialsNonExpired.getSelection());
                }

+               firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));

        }
 
 }
        }
 
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java
index 65f05e78c5f0ba197f4f871e04a4e061c24eb16e..08f561ce805d7b4cdd7515dfa0d99b24326b943f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java
@@ -31,7 +31,14 @@ public class UserDetailWizardPage extends AbstractCdmEntityWizardPage<User> {
        @Override
        public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) {
                UserDetailElement userElement = (UserDetailElement) formFactory.createCdmDetailElement(DetailType.USER, rootElement, SWT.NULL);
        @Override
        public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) {
                UserDetailElement userElement = (UserDetailElement) formFactory.createCdmDetailElement(DetailType.USER, rootElement, SWT.NULL);

+               userElement.setEntity(getEntity());

                return userElement;
        }
                return userElement;
        }

+       
+       @Override
+       protected void checkComplete() {
+               boolean hasUsername = getEntity().getUsername() != null;
+               setPageComplete(hasUsername);
+       };

 
 }
 
 }