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

Evolveum · Feb 8, 2018 · 4cc7ce1 · 4cc7ce1
2 parents e603a86 + 2928466
commit 4cc7ce1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 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
@@ -162,7 +162,6 @@ private <O extends ObjectType> ObjectWrapper<O> createObjectWrapper(String displ
 		List<ContainerWrapper<? extends Containerable>> containerWrappers = createContainerWrappers(objectWrapper, object,
 				objectDefinitionForEditing, status, this.result);
 		objectWrapper.setContainers(containerWrappers);
-		objectWrapper.sort();
 
         this.result.computeStatusIfUnknown();
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
@@ -217,7 +217,9 @@ protected void initializeModel(final PrismObject<O> objectToEdit, boolean isNewO
 
 			@Override
 			protected ObjectWrapper<O> load() {
-				return loadObjectWrapper(objectToEdit, isReadonly);
+				ObjectWrapper<O> wrapper = loadObjectWrapper(objectToEdit, isReadonly);
+				wrapper.sort();
+				return wrapper;
 			}
 		};
 

diff --git a/gui/admin-gui/testng-unit.xml b/gui/admin-gui/testng-unit.xml
@@ -18,7 +18,7 @@
 <suite name="unit" parallel="false">
     <test name="Web Unit" preserve-order="true" parallel="false" verbose="10">
         <classes>
-        	<!--<class name="com.evolveum.midpoint.web.TestUnitObjectWrapperFactory"/>-->
+        	<class name="com.evolveum.midpoint.web.TestUnitObjectWrapperFactory"/>
         	<class name="com.evolveum.midpoint.web.TestDescriptorLoader"/>
         </classes>
     </test>