Merge "Bug 508815 - Fixed org unit exists check" into develop
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/admin/action/CreateOrgUnitAction.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/admin/action/CreateOrgUnitAction.java
index 292fef8..15ea5f3 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/admin/action/CreateOrgUnitAction.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/admin/action/CreateOrgUnitAction.java
@@ -89,10 +89,13 @@
return;
}
- if (orgUnitExists(getPrimaryFieldName())) {
- openOrgUnitExistsDialog(shell, getPrimaryFieldName());
+ final Map<String, String> fieldValues = getFieldValues(newUserDialog);
+ final String primaryName = fieldValues.get(getPrimaryFieldName());
+
+ if (orgUnitExists(primaryName)) {
+ openOrgUnitExistsDialog(shell, primaryName);
} else {
- newUserId = createOrgUnit(getFieldValues(newUserDialog));
+ newUserId = createOrgUnit(fieldValues);
}
} catch (final ESException e) {
EMFStoreMessageDialog.showExceptionDialog(e);
@@ -106,7 +109,7 @@
if (!ACOrgUnit.class.isInstance(tableItem.getData())) {
continue;
}
- final ACOrgUnit orgUnit = ACOrgUnit.class.cast(tableItem.getData());
+ final ACOrgUnit<?> orgUnit = ACOrgUnit.class.cast(tableItem.getData());
if (orgUnit.getId().equals(newUserId)) {
index = tableViewer.getTable().indexOf(tableItem);
form.setInput(orgUnit);
