Fix MID-8310 hide cancel button

Evolveum · Oct 19, 2023 · 0a28702 · 0a28702
1 parent bfe25b1
commit 0a28702
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/...om/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanelWithDetailsPanel.java b/...om/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanelWithDetailsPanel.java
@@ -127,6 +127,8 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
                 ajaxRequestTarget.add(getPageBase().getFeedbackPanel());
             }
         };
+        cancelButton.add(new VisibleBehaviour(this::isCancelButtonVisible));
+
         buttonsContainer.add(cancelButton);
     }
 
@@ -147,6 +149,10 @@ protected boolean isButtonPanelVisible() {
         return true;
     }
 
+    protected boolean isCancelButtonVisible() {
+        return true;
+    }
+
     @Override
     public void editItemPerformed(AjaxRequestTarget target, IModel<PrismContainerValueWrapper<C>> rowModel,
             List<PrismContainerValueWrapper<C>> listItems) {

diff --git a/...n/assignmentholder/component/assignmentType/assignment/FocusMappingsAssignmentsPanel.java b/...n/assignmentholder/component/assignmentType/assignment/FocusMappingsAssignmentsPanel.java
@@ -45,7 +45,6 @@ protected QName getAssignmentType() {
         return null;
     }
 
-
     protected ObjectQuery createCustomizeQuery() {
         return getPageBase().getPrismContext().queryFor(AssignmentType.class)
                 .exists(AssignmentType.F_FOCUS_MAPPINGS).build();
@@ -92,4 +91,10 @@ protected void initializeNewAssignmentData(PrismContainerValue<AssignmentType> n
             target.add(getPageBase().getFeedbackPanel());
         }
     }
+
+    @Override
+    protected boolean isCancelButtonVisible() {
+        return false;
+    }
+
 }
diff --git a/...dmin/assignmentholder/component/assignmentType/assignment/PolicyRuleAssignmentsPanel.java b/...dmin/assignmentholder/component/assignmentType/assignment/PolicyRuleAssignmentsPanel.java
@@ -51,7 +51,6 @@ public PolicyRuleAssignmentsPanel(String id, IModel<PrismObjectWrapper<AH>> mode
     protected List<IColumn<PrismContainerValueWrapper<AssignmentType>, String>> initColumns() {
         List<IColumn<PrismContainerValueWrapper<AssignmentType>, String>> columns = new ArrayList<>();
 
-
         columns.add(new PrismContainerWrapperColumn<>(getContainerModel(), ItemPath.create(AssignmentType.F_POLICY_RULE, PolicyRuleType.F_POLICY_CONSTRAINTS), getPageBase()));
 
         columns.add(new PrismPropertyWrapperColumn<>(getContainerModel(), ItemPath.create(AssignmentType.F_POLICY_RULE, PolicyRuleType.F_POLICY_SITUATION), AbstractItemWrapperColumn.ColumnType.STRING, getPageBase()));
@@ -114,4 +113,10 @@ protected List<PrismContainerValueWrapper<AssignmentType>> customPostSearch(
         }
         return super.customPostSearch(list);
     }
+
+    @Override
+    protected boolean isCancelButtonVisible() {
+        return false;
+    }
+
 }
diff --git a/...in/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/PersonOfInterestPanel.java b/...in/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/PersonOfInterestPanel.java
@@ -33,7 +33,6 @@
 import com.evolveum.midpoint.gui.api.component.wizard.BasicWizardStepPanel;
 import com.evolveum.midpoint.gui.api.component.wizard.WizardModel;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
-import com.evolveum.midpoint.gui.api.page.PageAdminLTE;
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.LocalizationUtil;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
@@ -52,7 +51,6 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
-import com.evolveum.midpoint.web.security.MidPointApplication;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType;