restricting of expression panel usage

Evolveum · Apr 19, 2018 · 80f5308 · 80f5308
1 parent a8bb16f
commit 80f5308
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
@@ -31,9 +31,7 @@
 import com.evolveum.midpoint.web.component.input.ExpressionValuePanel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ExpressionType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.ItemDeltaType;
 import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType;
 
@@ -261,7 +259,11 @@ public boolean isVisible() {
             @Override
             protected void populateItem(final ListItem<ValueWrapper> item) {
                 BasePanel panel;
-                if (item.getModelObject().getItem().getItemDefinition().getTypeName().equals(ExpressionType.COMPLEX_TYPE)){
+                ItemWrapper itemWrapper = item.getModelObject().getItem();
+                if (itemWrapper.getPath().containsName(AssignmentType.F_CONSTRUCTION) &&
+                        itemWrapper.getPath().containsName(ConstructionType.F_ASSOCIATION) &&
+                        itemWrapper.getPath().containsName(ResourceObjectAssociationType.F_OUTBOUND) &&
+                        itemWrapper.getPath().containsName(MappingType.F_EXPRESSION)){
                     ExpressionWrapper expressionWrapper = (ExpressionWrapper)item.getModelObject().getItem();
                     panel = new ExpressionValuePanel("value", new PropertyModel(item.getModel(), "value.value"),
                             expressionWrapper.getConstruction(), pageBase);