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

Evolveum · Jan 31, 2022 · 39f7e3c · 39f7e3c
2 parents 04e0349 + 4096489
commit 39f7e3c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...ain/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationalButtonsPanel.java b/...ain/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationalButtonsPanel.java
@@ -10,6 +10,7 @@
 
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 
+import com.evolveum.midpoint.model.api.ModelAuthorizationAction;
 import com.evolveum.midpoint.web.component.dialog.DeleteConfirmationPanel;
 
 import org.apache.commons.lang3.StringUtils;
@@ -136,7 +137,11 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
     }
 
     protected boolean isDeleteButtonVisible() {
-        return isEditingObject() && !isReadonly();
+        return isEditingObject() && !isReadonly() && isAuthorizedToDelete();
+    }
+
+    private boolean isAuthorizedToDelete() {
+        return getPageBase().isAuthorized(ModelAuthorizationAction.DELETE, getModelObject().getObject());
     }
 
     protected boolean isReadonly() {

diff --git a/...l/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/ConditionEvaluator.java b/...l/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/ConditionEvaluator.java
@@ -80,7 +80,7 @@ private PrismValueDeltaSetTriple<PrismPropertyValue<Boolean>> evaluateConditionA
                 .addAliasRegistration(ExpressionConstants.VAR_USER, null)
                 .addAliasRegistration(ExpressionConstants.VAR_FOCUS, null)
                 .addVariableDefinition(ExpressionConstants.VAR_SOURCE, source, ObjectType.class)
-                .addVariableDefinition(ExpressionConstants.VAR_ASSIGNMENT_EVALUATOR, this, AssignmentEvaluator.class);
+                .addVariableDefinition(ExpressionConstants.VAR_ASSIGNMENT_EVALUATOR, ctx.ae, AssignmentEvaluator.class);
         builder = LensUtil.addAssignmentPathVariables(builder, assignmentPathVariables, ctx.ae.prismContext);
 
         MappingImpl<PrismPropertyValue<Boolean>, PrismPropertyDefinition<Boolean>> mapping = builder.build();
@@ -111,7 +111,7 @@ private PrismValueDeltaSetTriple<PrismPropertyValue<Boolean>> evaluateConditionR
                 .addAliasRegistration(ExpressionConstants.VAR_USER, null)
                 .addAliasRegistration(ExpressionConstants.VAR_FOCUS, null)
                 .addVariableDefinition(ExpressionConstants.VAR_SOURCE, source, ObjectType.class)
-                .addVariableDefinition(ExpressionConstants.VAR_ASSIGNMENT_EVALUATOR, this, AssignmentEvaluator.class);
+                .addVariableDefinition(ExpressionConstants.VAR_ASSIGNMENT_EVALUATOR, ctx.ae, AssignmentEvaluator.class);
         builder = LensUtil.addAssignmentPathVariables(builder, assignmentPathVariables, ctx.ae.prismContext);
 
         MappingImpl<PrismPropertyValue<Boolean>, PrismPropertyDefinition<Boolean>> mapping = builder.build();