MID-1791 - fixed incorrent handling of parent org unit addition to cr…

…eated Org Unit.
Evolveum · Mar 27, 2014 · ddb21bf · ddb21bf
1 parent 24a4d13
commit ddb21bf
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
@@ -338,7 +338,19 @@ private PrismObject<OrgType> buildUnitFromModel(List<ObjectReferenceType> parent
             }
         }
 
-        if (parentOrgList != null && parentOrgUnitsModel != null && parentOrgUnitsModel.getObject() != null) {
+        //We are creating new OrgUnit
+        if(parentOrgList == null){
+            if(parentOrgUnitsModel != null && parentOrgUnitsModel.getObject() != null){
+                for (OrgType parent : parentOrgUnitsModel.getObject()) {
+                    if (parent != null && WebMiscUtil.getName(parent) != null && !WebMiscUtil.getName(parent).isEmpty()) {
+                        ObjectReferenceType ref = new ObjectReferenceType();
+                        ref.setOid(parent.getOid());
+                        org.asObjectable().getParentOrgRef().add(ref);
+                    }
+                }
+            }
+        //We are editing OrgUnit
+        }else if (parentOrgUnitsModel != null && parentOrgUnitsModel.getObject() != null) {
             for (OrgType parent : parentOrgUnitsModel.getObject()) {
                 if (parent != null && WebMiscUtil.getName(parent) != null && !WebMiscUtil.getName(parent).isEmpty()) {
                     if(!isOrgParent(parent, parentOrgList)){