resource wizard schema handling fixes (MID-7499)

(cherry picked from commit 96c7ddc)
Evolveum · Jan 19, 2022 · 6f1bd15 · 6f1bd15
1 parent 519e62d
commit 6f1bd15
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 27 deletions.
diff --git a/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html b/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html
@@ -156,16 +156,6 @@ <h3 class="box-title"><span wicket:id="editorName"></span></h3>
                         <div wicket:id="editorAssociations" />
                     </dl>
 
-                    <!--<dl class="dl-horizontal">-->
-                        <!--<dt>-->
-                            <!--<label><wicket:message key="SchemaHandlingStep.label.assignmentPolicyRef" /></label>-->
-                            <!--<i wicket:id="assignmentPolicyRefTooltip" wicket:message="title:SchemaHandlingStep.tooltip.assignmentPolicyRef"/>-->
-                        <!--</dt>-->
-                        <!--<dd>-->
-                            <!--<select wicket:id="editorAssignmentPolicyRef" class="form-control input-sm"></select>-->
-                        <!--</dd>-->
-                    <!--</dl>-->
-
                     <!-- Iteration and Protected -->
                     <div class="row">
                         <div class="col-xs-6">

diff --git a/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java b/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
@@ -548,10 +548,6 @@ protected void onSubmit(AjaxRequestTarget target) {
         associationsTooltip.add(new InfoTooltipBehavior());
         editor.add(associationsTooltip);
 
-        Label assignmentPolicyRefTooltip = new Label(ID_T_ASSIGNMENT_POLICY_REF);
-        assignmentPolicyRefTooltip.add(new InfoTooltipBehavior());
-        editor.add(assignmentPolicyRefTooltip);
-
         Label iterationTooltip = new Label(ID_T_ITERATION);
         iterationTooltip.add(AttributeAppender.append("title", createStringResource("SchemaHandlingStep.tooltip.iteration",
                 WebComponentUtil.getMidpointCustomSystemName(getPageBase(), "midpoint.default.system.name"))));

diff --git a/...oint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java b/...oint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
@@ -64,19 +64,19 @@ public class ResourceActivationEditor extends BasePanel<ResourceActivationDefini
     private static final String ID_T_VALID_T_IN = "validToInboundTooltip";
 
     //Default mapping inbound/outbound sources/targets
-    public static final String EXISTENCE_DEFAULT_SOURCE = "&" + ExpressionConstants.VAR_LEGAL;
-    public static final String ADM_STATUS_OUT_SOURCE_DEFAULT = "&" + ExpressionConstants.VAR_FOCUS + "/activation/administrativeStatus";
-    public static final String ADM_STATUS_OUT_TARGET_DEFAULT = "&" + ExpressionConstants.VAR_PROJECTION + "/activation/administrativeStatus";
-    public static final String ADM_STATUS_IN_SOURCE_DEFAULT = "&" + ExpressionConstants.VAR_PROJECTION + "/activation/administrativeStatus";
-    public static final String ADM_STATUS_IN_TARGET_DEFAULT = "&" + ExpressionConstants.VAR_FOCUS + "/activation/administrativeStatus";
-    public static final String VALID_TO_OUT_SOURCE_DEFAULT = "&" + ExpressionConstants.VAR_FOCUS + "/activation/validTo";
-    public static final String VALID_TO_OUT_TARGET_DEFAULT = "&" + ExpressionConstants.VAR_PROJECTION + "/activation/validTo";
-    public static final String VALID_TO_IN_SOURCE_DEFAULT = "&" + ExpressionConstants.VAR_PROJECTION + "/activation/validTo";
-    public static final String VALID_TO_IN_TARGET_DEFAULT = "&" + ExpressionConstants.VAR_FOCUS + "/activation/validTo";
-    public static final String VALID_FROM_OUT_SOURCE_DEFAULT = "&" + ExpressionConstants.VAR_FOCUS + "/activation/validFrom";
-    public static final String VALID_FROM_OUT_TARGET_DEFAULT = "&" + ExpressionConstants.VAR_PROJECTION + "/activation/validFrom";
-    public static final String VALID_FROM_IN_SOURCE_DEFAULT = "&" + ExpressionConstants.VAR_PROJECTION + "/activation/validFrom";
-    public static final String VALID_FROM_IN_TARGET_DEFAULT = "&" + ExpressionConstants.VAR_FOCUS + "/activation/validFrom";
+    public static final String EXISTENCE_DEFAULT_SOURCE = "$" + ExpressionConstants.VAR_LEGAL;
+    public static final String ADM_STATUS_OUT_SOURCE_DEFAULT = "$" + ExpressionConstants.VAR_FOCUS + "/activation/administrativeStatus";
+    public static final String ADM_STATUS_OUT_TARGET_DEFAULT = "$" + ExpressionConstants.VAR_PROJECTION + "/activation/administrativeStatus";
+    public static final String ADM_STATUS_IN_SOURCE_DEFAULT = "$" + ExpressionConstants.VAR_PROJECTION + "/activation/administrativeStatus";
+    public static final String ADM_STATUS_IN_TARGET_DEFAULT = "$" + ExpressionConstants.VAR_FOCUS + "/activation/administrativeStatus";
+    public static final String VALID_TO_OUT_SOURCE_DEFAULT = "$" + ExpressionConstants.VAR_FOCUS + "/activation/validTo";
+    public static final String VALID_TO_OUT_TARGET_DEFAULT = "$" + ExpressionConstants.VAR_PROJECTION + "/activation/validTo";
+    public static final String VALID_TO_IN_SOURCE_DEFAULT = "$" + ExpressionConstants.VAR_PROJECTION + "/activation/validTo";
+    public static final String VALID_TO_IN_TARGET_DEFAULT = "$" + ExpressionConstants.VAR_FOCUS + "/activation/validTo";
+    public static final String VALID_FROM_OUT_SOURCE_DEFAULT = "$" + ExpressionConstants.VAR_FOCUS + "/activation/validFrom";
+    public static final String VALID_FROM_OUT_TARGET_DEFAULT = "$" + ExpressionConstants.VAR_PROJECTION + "/activation/validFrom";
+    public static final String VALID_FROM_IN_SOURCE_DEFAULT = "$" + ExpressionConstants.VAR_PROJECTION + "/activation/validFrom";
+    public static final String VALID_FROM_IN_TARGET_DEFAULT = "$" + ExpressionConstants.VAR_FOCUS + "/activation/validFrom";
 
     private boolean isInitialized = false;
     private NonEmptyModel<Boolean> readOnlyModel;