Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Mar 17, 2020 · 127e79d · 127e79d
2 parents b57a839 + 92f4e7e
commit 127e79d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.editorconfig b/.editorconfig
@@ -1,6 +1,6 @@
 [*]
 charset = utf-8
-end_of_line = crlf
+end_of_line = lf
 indent_size = 4
 indent_style = space
 insert_final_newline = false

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ItemWrapperFactoryImpl.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ItemWrapperFactoryImpl.java
@@ -66,6 +66,7 @@ public IW createWrapper(PrismContainerValueWrapper<?> parent, ItemDefinition<?>
 
         if (childItem == null) {
             childItem = (I) parent.getNewValue().findOrCreateItem(name);
+            childItem.setDefinition(def);
         }
 
         return createWrapper(parent, childItem, status, context);