From 8fa2fa58bd6e4c1862f3c12eb519daa57e00e7a1 Mon Sep 17 00:00:00 2001
From: kate <honchar@evolveum.com>
Date: Thu, 12 Dec 2019 12:29:06 +0100
Subject: [PATCH] MID-5945 fix

---
 .../page/admin/server/TaskProgressTabPanel.java | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.java
index 6ce26bb7f3e..4260a3da7bb 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskProgressTabPanel.java
@@ -10,6 +10,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.evolveum.midpoint.web.page.admin.server.dto.SynchronizationInformationDto;
 import org.apache.wicket.Component;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
@@ -79,7 +80,13 @@ public boolean isVisible() {
         add(iterativeInformationPanel);
 
         synchronizationInformationPanelBefore = new SynchronizationInformationPanel(ID_SYNCHRONIZATION_INFORMATION_PANEL_BEFORE,
-            new PropertyModel<>(model, TaskCurrentStateDto.F_SYNCHRONIZATION_INFORMATION_DTO), false);
+                new LoadableModel<SynchronizationInformationDto>() {
+                    @Override
+                    protected SynchronizationInformationDto load() {
+                        return model == null || model.getObject() == null ? null :
+                                model.getObject().getSynchronizationInformationDto();
+                    }
+                }, false);
         synchronizationInformationPanelBefore.add(new VisibleEnableBehaviour() {
             @Override
             public boolean isVisible() {
@@ -90,7 +97,13 @@ public boolean isVisible() {
         add(synchronizationInformationPanelBefore);
 
         synchronizationInformationPanelAfter = new SynchronizationInformationPanel(ID_SYNCHRONIZATION_INFORMATION_PANEL_AFTER,
-            new PropertyModel<>(model, TaskCurrentStateDto.F_SYNCHRONIZATION_INFORMATION_AFTER_DTO), true);
+                new LoadableModel<SynchronizationInformationDto>() {
+                    @Override
+                    protected SynchronizationInformationDto load() {
+                        return model == null || model.getObject() == null ? null :
+                                model.getObject().getSynchronizationInformationDto();
+                    }
+                }, true);
         synchronizationInformationPanelAfter.add(new VisibleEnableBehaviour() {
             @Override
             public boolean isVisible() {