MID-4702 audit log viewer doesn't save filter fix

Evolveum · Jun 5, 2018 · c8430af · c8430af
1 parent 9c508ce
commit c8430af
Showing 1 changed file with 27 additions and 6 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java
@@ -3,6 +3,8 @@
 import com.evolveum.midpoint.web.page.admin.reports.component.AuditLogViewerPanel;
 import com.evolveum.midpoint.web.page.admin.reports.dto.AuditSearchDto;
 
+import com.evolveum.midpoint.web.session.AuditLogStorage;
+import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
 import com.evolveum.midpoint.gui.api.page.PageBase;
@@ -26,37 +28,56 @@ public PageAuditLogViewer() {
 	}
 
     private void initLayout(){
-        AuditLogViewerPanel panel = new AuditLogViewerPanel(ID_PANEL, Model.of(new AuditSearchDto()), false) {
+        AuditLogViewerPanel panel = new AuditLogViewerPanel(ID_PANEL, new IModel<AuditSearchDto>() {
+			@Override
+			public AuditSearchDto getObject() {
+				return getAuditLogStorage().getSearchDto();
+			}
+
+			@Override
+			public void setObject(AuditSearchDto auditSearchDto) {
+				getAuditLogStorage().setSearchDto(auditSearchDto);
+			}
+
+			@Override
+			public void detach() {
+
+			}
+		}, false) {
 
 			private static final long serialVersionUID = 1L;
 
 			@Override
 			protected void updateAuditSearchStorage(AuditSearchDto searchDto) {
-				getPageBase().getSessionStorage().getAuditLog().setSearchDto(searchDto);
-				getPageBase().getSessionStorage().getAuditLog().setPageNumber(0);
+				getAuditLogStorage().setSearchDto(searchDto);
+				getAuditLogStorage().setPageNumber(0);
 			}
 
 			@Override
 			protected void resetAuditSearchStorage() {
-				getPageBase().getSessionStorage().getAuditLog().setSearchDto(new AuditSearchDto());
+				getAuditLogStorage().setSearchDto(new AuditSearchDto());
 
 			}
 
 			@Override
 			protected void updateCurrentPage(long current) {
-				getPageBase().getSessionStorage().getAuditLog().setPageNumber(current);
+				getAuditLogStorage().setPageNumber(current);
 
 			}
 
 			@Override
 			protected long getCurrentPage() {
-				return getPageBase().getSessionStorage().getAuditLog().getPageNumber();
+				return getAuditLogStorage().getPageNumber();
 			}
 
         };
         panel.setOutputMarkupId(true);
         add(panel);
     }
 
+    private AuditLogStorage getAuditLogStorage(){
+		return getSessionStorage().getAuditLog();
+	}
+
 
 }