small improvements for tables

Evolveum · Apr 30, 2019 · 63bad50 · 63bad50
1 parent 2f5ad79
commit 63bad50
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 191 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -2619,7 +2619,7 @@ public <ID extends ItemDefinition, IW extends ItemWrapper> IW createItemWrapper(
 
     }
 
-    public Class<?> getWrapperPanel(QName typeName) {
+    private Class<?> getWrapperPanel(QName typeName) {
     	return registry.getPanelClass(typeName);
     }
 

diff --git a/...com/evolveum/midpoint/gui/impl/component/data/column/PrismPropertyWrapperColumnPanel.java b/...com/evolveum/midpoint/gui/impl/component/data/column/PrismPropertyWrapperColumnPanel.java
@@ -52,8 +52,6 @@ protected String createLabel(PrismPropertyValueWrapper<T> object) {
 	@Override
 	protected Panel createValuePanel(String id, IModel<PrismPropertyWrapper<T>> model, PrismPropertyValueWrapper<T> object) {
 
-		model.getObject().setColumn(true);
-
 		Panel panel;
 		try {
 			panel = getPageBase().initItemPanel(id, model.getObject().getTypeName(), model, null);

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/PrismReferenceWrapper.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/PrismReferenceWrapper.java
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/PrismReferenceWrapperImpl.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/PrismReferenceWrapperImpl.java
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemPanel.java
@@ -32,6 +32,7 @@
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.factory.GuiComponentFactory;
 import com.evolveum.midpoint.gui.api.prism.ItemWrapper;
+import com.evolveum.midpoint.gui.impl.component.data.column.AbstractItemWrapperColumnPanel;
 import com.evolveum.midpoint.prism.Item;
 import com.evolveum.midpoint.prism.ItemDefinition;
 import com.evolveum.midpoint.prism.PrismValue;
@@ -76,7 +77,7 @@ protected void onInitialize() {
 	private void initLayout() {
 
 		Panel headerPanel = createHeaderPanel();
-		headerPanel.add(new VisibleBehaviour(() -> getModelObject() != null && !getModelObject().isColumn()));
+		headerPanel.add(new VisibleBehaviour(() -> getParent().findParent(AbstractItemWrapperColumnPanel.class) == null));
 		add(headerPanel);
 
 		ListView<VW> valuesPanel = createValuesPanel();