Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Aug 13, 2019 · f9671d0 · f9671d0
2 parents ca4b94f + e07633c
commit f9671d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java b/...gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
@@ -204,7 +204,6 @@ public static AssignmentEditorDto createDtoFromObject(ObjectType object, UserDto
 
 		AssignmentType assignment = new AssignmentType();
 		assignment.setTargetRef(targetRef);
-		assignment.setTarget(object);
 
 		return new AssignmentEditorDto(status, assignment, pageBase);
 	}
@@ -552,6 +551,10 @@ public PrismContainerValue<AssignmentType> getNewValue(PrismContext prismContext
 		if (activation == null || activation.asPrismContainerValue().isEmpty()) {
 			newAssignment.setActivation(null);
 		}
+		//hack for delegation panel. this code should be rewritten
+		if (newAssignment.getMetadata() != null && newAssignment.getMetadata().asPrismContainerValue().isEmpty()){
+			newAssignment.setMetadata(null);
+		}
 
 		if (tenantRef != null && AssignmentEditorDtoType.ROLE.equals(this.type)) {
 			if (tenantRef.getOid() == null) {

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -14007,6 +14007,9 @@
                        (Target OID, type and relation is matched.)
                        Note: Filter in the reference is not yet supported.
                    </xsd:documentation>
+                   <xsd:appinfo>
+                       <a:objectReferenceTargetType>tns:FocusType</a:objectReferenceTargetType>
+                   </xsd:appinfo>
                </xsd:annotation>
            </xsd:element>
            <xsd:element name="allowTransitive" type="xsd:boolean" minOccurs="0" default="false">