From 686990cfd814508764b853bfdc5e06ac337689f2 Mon Sep 17 00:00:00 2001
From: Erik Suta <erik.suta@evolveum.com>
Date: Wed, 23 Jul 2014 22:24:53 +0200
Subject: [PATCH] one more tenantRef GUI fix...

---
 .../web/component/assignment/AssignmentEditorDto.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
index c37d6641002..0cad19915be 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
@@ -214,9 +214,13 @@ public PrismContainerValue getNewValue() throws SchemaException {
         }
 
         if(tenantRef != null && AssignmentEditorDtoType.ROLE.equals(this.type)){
-            ObjectReferenceType ref = new ObjectReferenceType();
-            ref.setOid(this.tenantRef.getOid());
-            newAssignment.setTenantRef(ref);
+            if(tenantRef.getOid() == null){
+                newAssignment.setTenantRef(null);
+            } else {
+                ObjectReferenceType ref = new ObjectReferenceType();
+                ref.setOid(this.tenantRef.getOid());
+                newAssignment.setTenantRef(ref);
+            }
         }
 
         ConstructionType construction = newAssignment.getConstruction();