stringResourceModel -> BasePanel, do not use component so the model c…

…an be detached. and do not detach what should not be detached
Evolveum · Feb 1, 2022 · adbf00c · adbf00c
1 parent 6596c1a
commit adbf00c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 33 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java
@@ -67,13 +67,13 @@ public String getString(Enum<?> e) {
     }
 
     public StringResourceModel createStringResource(String resourceKey, IModel<?> model, Object... objects) {
-        return new StringResourceModel(resourceKey, this).setModel(model)
+        return new StringResourceModel(resourceKey).setModel(model)
                 .setDefaultValue(resourceKey)
                 .setParameters(objects);
     }
 
     public StringResourceModel createStringResource(String resourceKey, Object... objects) {
-        return new StringResourceModel(resourceKey, this).setModel(null)
+        return new StringResourceModel(resourceKey).setModel(null)
                 .setDefaultValue(resourceKey)
                 .setParameters(objects);
     }
@@ -84,7 +84,7 @@ public StringResourceModel createStringResource(PolyString polystringKey, Object
             // TODO later: use polystringKey.getKey()
             resourceKey = polystringKey.getOrig();
         }
-        return new StringResourceModel(resourceKey, this).setModel(null)
+        return new StringResourceModel(resourceKey).setModel(null)
                 .setDefaultValue(resourceKey)
                 .setParameters(objects);
     }
@@ -95,7 +95,7 @@ public StringResourceModel createStringResource(PolyStringType polystringKey, Ob
             // TODO later: use polystringKey.getKey()
             resourceKey = polystringKey.getOrig();
         }
-        return new StringResourceModel(resourceKey, this).setModel(null)
+        return new StringResourceModel(resourceKey).setModel(null)
                 .setDefaultValue(resourceKey)
                 .setParameters(objects);
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -683,27 +683,7 @@ public String getObject() {
         pageTitleReal.setRenderBodyOnly(true);
         pageTitle.add(pageTitleReal);
 
-        LoadableDetachableModel<List<Breadcrumb>> breadcrumbsModel = new LoadableDetachableModel<List<Breadcrumb>>() {
-
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            protected List<Breadcrumb> load() {
-                return getBreadcrumbs();
-            }
-
-            @Override
-            protected void onDetach() {
-                for (Breadcrumb b : getObject()) {
-                    b.detach();
-                }
-            }
-
-            //            @Override
-//            public List<Breadcrumb> getObject() {
-//                return getBreadcrumbs();
-//            }
-        };
+        IModel<List<Breadcrumb>> breadcrumbsModel = () -> getBreadcrumbs();
 
         ListView<Breadcrumb> breadcrumbs = new ListView<>(ID_BREADCRUMB, breadcrumbsModel) {
 
@@ -746,14 +726,14 @@ public boolean isVisible() {
                 Label bcName = new Label(ID_BC_NAME, item.getModelObject().getLabel());
                 bcLink.add(bcName);
 
-//                item.add(new VisibleEnableBehaviour() {
-//                    private static final long serialVersionUID = 1L;
-//
-//                    @Override
-//                    public boolean isVisible() {
-//                        return item.getModelObject().isVisible();
-//                    }
-//                });
+                item.add(new VisibleEnableBehaviour() {
+                    private static final long serialVersionUID = 1L;
+
+                    @Override
+                    public boolean isVisible() {
+                        return item.getModelObject().isVisible();
+                    }
+                });
             }
         };
         breadcrumbs.add(new VisibleBehaviour(() -> !isErrorPage()));