MID-8539 fixed confirmation dialog for deleting simulation results/ob…

…jects
Evolveum · Mar 1, 2023 · 9f09468 · 9f09468
1 parent 844938a
commit 9f09468
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...ain/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/SimulationResultsPanel.java b/...ain/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/SimulationResultsPanel.java
@@ -179,11 +179,16 @@ private void deleteResultObjectsConfirmedPerformed(AjaxRequestTarget target, IMo
     private IModel<String> createConfirmationMessage(ColumnMenuAction<SelectableBean<SimulationResultType>> action, String singleKey, String multiKey) {
         return () -> {
             IModel<SelectableBean<SimulationResultType>> result = action.getRowModel();
-            if (action.getRowModel() != null || getSelectedObjectsCount() == 1) {
+            if (result != null) {
                 return getString(singleKey, WebComponentUtil.getName(result.getObject().getValue()));
             }
 
-            return getString(multiKey, getSelectedRealObjects());
+            if (getSelectedObjectsCount() == 1) {
+                SimulationResultType object = getSelectedRealObjects().get(0);
+                return getString(singleKey, WebComponentUtil.getName(object));
+            }
+
+            return getString(multiKey, getSelectedObjectsCount());
         };
     }