Merge remote-tracking branch 'origin/master'

Evolveum · Oct 21, 2023 · 48281a3 · 48281a3
2 parents d47c78c + 79e8fd4
commit 48281a3
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 5 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/...va/com/evolveum/midpoint/gui/impl/component/data/column/ConfigurableExpressionColumn.java b/...va/com/evolveum/midpoint/gui/impl/component/data/column/ConfigurableExpressionColumn.java
@@ -49,6 +49,8 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 
+import org.apache.wicket.model.LoadableDetachableModel;
+
 public class ConfigurableExpressionColumn<S extends SelectableRow<T>, T extends Serializable> extends AbstractExportableColumn<S, String> {
 
     private static final Trace LOGGER = TraceManager.getTrace(ConfigurableExpressionColumn.class);
@@ -92,7 +94,12 @@ public void populateItem(org.apache.wicket.markup.repeater.Item<ICellPopulator<S
     public IModel<String> getDataModel(IModel<S> rowModel) {
         ItemPath columnPath = WebComponentUtil.getPath(customColumn);
 
-        return () -> loadExportableColumnDataModel(rowModel, customColumn, columnPath, expression);
+        return new LoadableDetachableModel<>() {
+            @Override
+            protected String load() {
+                return loadExportableColumnDataModel(rowModel, customColumn, columnPath, expression);
+            }
+        };
     }
 
     @Override

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
@@ -615,7 +615,11 @@ private void addUsersPerformed(AjaxRequestTarget target, List<UserType> users) {
     @Override
     public boolean onBackPerformed(AjaxRequestTarget target) {
         if (selectionState.getObject() == SelectionState.TILES) {
-            return super.onBackPerformed(target);
+            boolean executeDefaultBehaviour = super.onBackPerformed(target);
+            if (!executeDefaultBehaviour) {
+                getPageBase().redirectBack();
+            }
+            return executeDefaultBehaviour;
         }
 
         selectionState.setObject(SelectionState.TILES);

diff --git a/...ava/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeAndRelationDialogPanel.java b/...ava/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeAndRelationDialogPanel.java
@@ -72,7 +72,17 @@ private void initLayout(){
 
         DropDownFormGroup<QName> type = new DropDownFormGroup<>(ID_OBJECT_TYPE, Model.of(getDefaultObjectType()), Model.ofList(getSupportedObjectTypes()),
                 new QNameObjectTypeChoiceRenderer(), createStringResource("chooseFocusTypeAndRelationDialogPanel.type"),
-                createStringResource("chooseFocusTypeAndRelationDialogPanel.tooltip.type"), "col-md-4", "col-md-8", true);
+                createStringResource("chooseFocusTypeAndRelationDialogPanel.tooltip.type"), null, null, true){
+            @Override
+            protected String getLabelContainerCssClass() {
+                return "col-md-4";
+            }
+
+            @Override
+            protected String getPropertyContainerCssClass() {
+                return "col-md-8";
+            }
+        };
         type.getInput().add(new EmptyOnChangeAjaxFormUpdatingBehavior());
         type.setOutputMarkupId(true);
         type.add(new VisibleBehaviour(this::isFocusTypeSelectorVisible));

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
@@ -67,6 +67,7 @@ private void initLayout(IModel<List<T>> choices, IChoiceRenderer<T> renderer, IM
             String labelCssClass, String textCssClass, final boolean required,
             boolean isSimilarAsPropertyPanel) {
         WebMarkupContainer labelContainer = new WebMarkupContainer(ID_LABEL_CONTAINER);
+        labelContainer.add(AttributeAppender.prepend("class", getLabelContainerCssClass()));
         labelContainer.add(new VisibleBehaviour(() -> label != null && StringUtils.isNotEmpty(label.getObject())));
         add(labelContainer);
 
@@ -96,6 +97,7 @@ private void initLayout(IModel<List<T>> choices, IChoiceRenderer<T> renderer, IM
         labelContainer.add(requiredContainer);
 
         WebMarkupContainer propertyLabel = new WebMarkupContainer(ID_PROPERTY_LABEL);
+        propertyLabel.add(AttributeAppender.prepend("class", getPropertyContainerCssClass()));
         WebMarkupContainer rowLabel = new WebMarkupContainer(ID_ROW);
         WebMarkupContainer selectWrapper = new WebMarkupContainer(ID_SELECT_WRAPPER);
         if (StringUtils.isNotEmpty(textCssClass)) {
@@ -162,4 +164,12 @@ public DropDownChoice<T> getInput() {
     protected String getNullValidDisplayValue() {
         return getString("DropDownChoicePanel.empty");
     }
+
+    protected String getLabelContainerCssClass() {
+        return "";
+    }
+
+    protected String getPropertyContainerCssClass() {
+        return "";
+    }
 }