Revert "MID-8883 page titles for simulation pages fix"

This reverts commit 92bcd30.
Evolveum · Jun 14, 2023 · 2684b67 · 2684b67
1 parent 099bc30
commit 2684b67
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.java b/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.java
@@ -349,7 +349,7 @@ private void initLayout() {
 
             @Override
             protected IModel<String> createTitleModel() {
-                return PageSimulationResult.this.createPageTitleModel();
+                return PageSimulationResult.this.createTitleModel();
             }
 
             @Override
@@ -584,11 +584,15 @@ private void redirectToTaskDetails() {
 
     @Override
     protected IModel<String> createPageTitleModel() {
+        return () -> null;
+    }
+
+    private IModel<String> createTitleModel() {
         return () -> WebComponentUtil.getDisplayNameOrName(resultModel.getObject().asPrismObject());
     }
 
     @Override
     protected void createBreadcrumb() {
-        addBreadcrumb(new Breadcrumb(createPageTitleModel(), this.getClass(), getPageParameters()));
+        addBreadcrumb(new Breadcrumb(createTitleModel(), this.getClass(), getPageParameters()));
     }
 }
diff --git a/...java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResultObject.java b/...java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResultObject.java
@@ -299,7 +299,7 @@ private void initLayout() {
 
             @Override
             protected IModel<String> createTitleModel() {
-                return PageSimulationResultObject.this.createPageTitleModel();
+                return PageSimulationResultObject.this.createTitleModel();
             }
 
             @Override
@@ -451,16 +451,21 @@ private void onRelatedObjectClicked(SelectableBean<SimulationResultProcessedObje
 
     @Override
     protected IModel<String> createPageTitleModel() {
-        return () -> WebComponentUtil.getOrigStringFromPoly(objectModel.getObject().getName())
-                + " (" + WebComponentUtil.getDisplayNameOrName(resultModel.getObject().asPrismObject()) + ")";
+        return () -> null;
     }
 
     private void onBackPerformed() {
         redirectBack();
     }
 
+    private IModel<String> createTitleModel() {
+        return () ->
+                WebComponentUtil.getOrigStringFromPoly(objectModel.getObject().getName())
+                        + " (" + WebComponentUtil.getDisplayNameOrName(resultModel.getObject().asPrismObject()) + ")";
+    }
+
     @Override
     protected void createBreadcrumb() {
-        addBreadcrumb(new Breadcrumb(createPageTitleModel(), this.getClass(), getPageParameters()));
+        addBreadcrumb(new Breadcrumb(createTitleModel(), this.getClass(), getPageParameters()));
     }
 }
diff --git a/...ava/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResultObjects.java b/...ava/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResultObjects.java
@@ -136,12 +136,16 @@ protected List<MarkType> load() {
 
     @Override
     protected IModel<String> createPageTitleModel() {
+        return () -> null;
+    }
+
+    private IModel<String> createTitleModel() {
         return () -> getString("PageSimulationResultObjects.title");
     }
 
     @Override
     protected void createBreadcrumb() {
-        addBreadcrumb(new Breadcrumb(createPageTitleModel(), this.getClass(), getPageParameters()));
+        addBreadcrumb(new Breadcrumb(PageSimulationResultObjects.super.createPageTitleModel(), this.getClass(), getPageParameters()));
     }
 
     private IModel<List<MarkType>> createNonEmptyMarksModel() {
@@ -176,7 +180,7 @@ private void initLayout() {
 
             @Override
             protected IModel<String> createTitleModel() {
-                return PageSimulationResultObjects.this.createPageTitleModel();
+                return PageSimulationResultObjects.this.createTitleModel();
             }
 
             @Override

diff --git a/...main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResults.java b/...main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResults.java
@@ -77,7 +77,7 @@ private void initLayout() {
 
             @Override
             protected IModel<String> createTitleModel() {
-                return PageSimulationResults.this.createPageTitleModel();
+                return PageSimulationResults.super.createPageTitleModel();
             }
         };
         add(navigation);
@@ -91,6 +91,11 @@ protected IModel<String> createTitleModel() {
         form.add(table);
     }
 
+    @Override
+    protected IModel<String> createPageTitleModel() {
+        return () -> null;
+    }
+
     @Override
     protected void createBreadcrumb() {
         addBreadcrumb(new Breadcrumb(PageSimulationResults.super.createPageTitleModel(), this.getClass(), getPageParameters()));