MID-9186:fix initialization warning message model for ConfigureTaskCo…

…nfirmationPanel
Evolveum · Oct 10, 2023 · efc1583 · efc1583
1 parent ee69fc1
commit efc1583
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java b/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java
@@ -925,7 +925,7 @@ private void recomputeMembersPerformed(IModel<?> rowModel, AjaxRequestTarget tar
             private static final long serialVersionUID = 1L;
 
             @Override
-            protected IModel<String> getWarningMessageModel() {
+            protected IModel<String> createWarningMessageModel() {
                 if (isSubtreeScope()) {
                     return createStringResource("abstractRoleMemberPanel.recompute.warning.subtree");
                 }
@@ -1134,7 +1134,7 @@ private void showConfirmDialog(
         ConfirmationPanel dialog = new ConfigureTaskConfirmationPanel(getPageBase().getMainPopupBodyId(), confirmModel) {
 
             @Override
-            protected IModel<String> getWarningMessageModel() {
+            protected IModel<String> createWarningMessageModel() {
                 if (isSubtreeScope() && rowModel == null) {
                     return createStringResource("abstractRoleMemberPanel.unassign.warning.subtree");
                 } else if (isIndirect() && rowModel == null) {

diff --git a/.../main/java/com/evolveum/midpoint/web/component/dialog/ConfigureTaskConfirmationPanel.java b/.../main/java/com/evolveum/midpoint/web/component/dialog/ConfigureTaskConfirmationPanel.java
@@ -33,12 +33,20 @@ public ConfigureTaskConfirmationPanel(String id) {
 
     }
 
+    private final IModel<String> warningMessageModel;
+
     public ConfigureTaskConfirmationPanel(String id, IModel<String> message) {
         super(id, message);
+        warningMessageModel = createWarningMessageModel();
+    }
+
+    @Override
+    protected void onInitialize() {
+        super.onInitialize();
 
-        MessagePanel<?> warningMessage = new MessagePanel<>("warnningMessage", MessagePanel.MessagePanelType.WARN, getWarningMessageModel());
+        MessagePanel<?> warningMessage = new MessagePanel<>("warnningMessage", MessagePanel.MessagePanelType.WARN, warningMessageModel);
         warningMessage.setOutputMarkupId(true);
-        warningMessage.add(new VisibleBehaviour(() -> getWarningMessageModel() != null));
+        warningMessage.add(new VisibleBehaviour(() -> warningMessageModel != null));
         add(warningMessage);
     }
 
@@ -64,7 +72,7 @@ protected PrismObject<TaskType> createTask(AjaxRequestTarget target) {
         return null;
     }
 
-    protected IModel<String> getWarningMessageModel() {
+    protected IModel<String> createWarningMessageModel() {
         return null;
     }