Merge branch 'master' into feature/smart-correlation-prototype

Evolveum · Jul 21, 2022 · c0ab3dd · c0ab3dd
2 parents 0e52d4d + 65c050a
commit c0ab3dd
Show file tree

Hide file tree

Showing 2 changed files with 97 additions and 51 deletions.
diff --git a/gui/admin-gui/package-lock.json b/gui/admin-gui/package-lock.json
diff --git a/...m/evolveum/midpoint/gui/impl/page/admin/assignmentholder/PageAssignmentHolderDetails.java b/...m/evolveum/midpoint/gui/impl/page/admin/assignmentholder/PageAssignmentHolderDetails.java
@@ -17,6 +17,7 @@
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
@@ -129,6 +130,7 @@ protected void onTemplateChosePerformed(CompiledObjectCollectionView collectionV
                 fragment.setOutputMarkupId(true);
                 PageAssignmentHolderDetails.this.replace(fragment);
                 target.add(fragment);
+                target.add(getTitleContainer());
             }
         };
     }
@@ -169,23 +171,28 @@ protected AHDM createObjectDetailsModels(PrismObject<AH> object) {
 
     @Override
     protected IModel<String> createPageTitleModel() {
-        String objectCollectionName = getObjectCollectionName();
-        if (objectCollectionName != null) {
-            return () -> {
-                if (getObjectDetailsModels() != null && getObjectDetailsModels().getObjectStatus() == ItemStatus.ADDED) {
-                    return createStringResource("PageAdminObjectDetails.title.new", objectCollectionName).getString();
-                }
-
-                String name = null;
-                if (getModelWrapperObject() != null && getModelWrapperObject().getObject() != null) {
-                    name = WebComponentUtil.getName(getModelWrapperObject().getObject());
+        final IModel<String> defaultTitleModel = super.createPageTitleModel();
+        return new LoadableDetachableModel<String>() {
+            @Override
+            protected String load() {
+                String objectCollectionName = getObjectCollectionName();
+                if (objectCollectionName != null) {
+                    if (getObjectDetailsModels() != null && getObjectDetailsModels().getObjectStatus() == ItemStatus.ADDED) {
+                        return createStringResource("PageAdminObjectDetails.title.new", objectCollectionName).getString();
+                    }
+
+                    String name = null;
+                    if (getModelWrapperObject() != null && getModelWrapperObject().getObject() != null) {
+                        name = WebComponentUtil.getName(getModelWrapperObject().getObject());
+                    }
+
+                    return createStringResource("PageAdminObjectDetails.title.edit.readonly.${readOnly}", getModel(), objectCollectionName, name).getString();
                 }
 
-                return createStringResource("PageAdminObjectDetails.title.edit.readonly.${readOnly}", getModel(), objectCollectionName, name).getString();
-            };
-        }
+                return defaultTitleModel.getObject();
 
-        return super.createPageTitleModel();
+            }
+        };
     }
 
     private String getObjectCollectionName() {