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

Evolveum · Jul 12, 2016 · bb6c724 · bb6c724
2 parents 7c12449 + c3a7e2a
commit bb6c724
Show file tree

Hide file tree

Showing 16 changed files with 1,207 additions and 439 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapperFactory.java
@@ -248,7 +248,10 @@ private <O extends ObjectType, C extends Containerable> void addContainerWrapper
             if (ApprovalSchemaType.COMPLEX_TYPE.equals(def.getTypeName())) {
                 continue;
             }
-
+            if (PasswordHistoryEntryType.COMPLEX_TYPE.equals(def.getTypeName())) {
+            	continue;
+            }
+
             LOGGER.trace("ObjectWrapper.createContainerWrapper processing definition: {}", def);
 
             PrismContainerDefinition containerDef = (PrismContainerDefinition) def;