preparation for audit log details page.. + some fixes in incompatible…

… types..
Evolveum · Oct 11, 2016 · 2405e96 · 2405e96
1 parent a3cafe3
commit 2405e96
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 9 deletions.
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2013 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:extend>
+
+todo
+
+</wicket:extend>
+</body>
+</html>
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
@@ -0,0 +1,44 @@
+package com.evolveum.midpoint.web.page.admin.reports;
+
+import org.apache.wicket.model.IModel;
+
+import com.evolveum.midpoint.gui.api.model.LoadableModel;
+import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.security.api.AuthorizationConstants;
+import com.evolveum.midpoint.web.application.AuthorizationAction;
+import com.evolveum.midpoint.web.application.PageDescriptor;
+import com.evolveum.midpoint.web.page.admin.configuration.PageAdminConfiguration;
+import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventRecordType;
+
+
+@PageDescriptor(url = "/admin/auditLogDetails", action = {
+		@AuthorizationAction(actionUri = PageAdminReports.AUTH_REPORTS_ALL,
+				label = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_LABEL,
+				description = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_DESCRIPTION),
+		@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_AUDIT_LOG_VIEWER_URL,
+		label = "PageAuditLogViewer.auth.auditLogViewer.label",
+		description = "PageAuditLogViewer.auth.auditLogViewer.description")})
+public class PageAuditLogDetails extends PageBase{
+
+	private static final long serialVersionUID = 1L;
+
+	private IModel<AuditEventRecordType> recordModel;
+
+	public PageAuditLogDetails(final AuditEventRecordType recordType) {
+
+		recordModel = new LoadableModel<AuditEventRecordType>(false) {
+
+			@Override
+			protected AuditEventRecordType load() {
+				return recordType;
+			}
+		};
+
+		initLayout();
+	}
+
+	private void initLayout(){
+		//TODO
+	}
+
+}
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
@@ -24,6 +24,7 @@
 import com.evolveum.midpoint.web.application.PageDescriptor;
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
+import com.evolveum.midpoint.web.component.data.column.LinkColumn;
 import com.evolveum.midpoint.web.component.input.DatePanel;
 import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
 import com.evolveum.midpoint.web.component.input.TextPanel;
@@ -113,7 +114,7 @@ private void initParametersPanel(Form mainForm){
 		AjaxButton ajaxButton = new AjaxButton(ID_SEARCH_BUTTON, createStringResource("BasicSearchPanel.search")) {
 			@Override
 			public void onClick(AjaxRequestTarget arg0) {
-				Form mainForm = (Form)get(ID_MAIN_FORM);
+				Form mainForm = (Form)getParent().getParent();
 				initTable(mainForm);
 				arg0.add(mainForm);
 				// TODO Auto-generated method stub
@@ -131,11 +132,21 @@ private void initTable(Form mainForm){
 				(int) getItemsPerPage(UserProfileStorage.TableId.PAGE_AUDIT_LOG_VIEWER));
 		table.setShowPaging(true);
 		table.setOutputMarkupId(true);
-		mainForm.add(table);
+		mainForm.addOrReplace(table);
 	}
 
-	private List<IColumn<SelectableBean<AuditEventRecordType>, String>> initColumns() {
-		List<IColumn<SelectableBean<AuditEventRecordType>, String>> columns = new ArrayList<>();
+	private List<IColumn<AuditEventRecordType, String>> initColumns() {
+		List<IColumn<AuditEventRecordType, String>> columns = new ArrayList<>();
+		IColumn<AuditEventRecordType, String> linkColumn = new LinkColumn<AuditEventRecordType>(createStringResource("PageAuditLogViewer.column.time"), "timestamp"){
+
+			@Override
+			public void onClick(AjaxRequestTarget target, IModel<AuditEventRecordType> rowModel) {
+				setResponsePage(new PageAuditLogDetails(rowModel.getObject()));
+			}
+
+
+		};
+		columns.add(linkColumn);
 		IColumn timeColumn = new PropertyColumn(createStringResource("PageAuditLogViewer.column.time"), "timestamp");
 		columns.add(timeColumn);
 		IColumn initiatorColumn = new PropertyColumn(createStringResource("PageAuditLogViewer.column.initiatorRef"), "initiatorRef");

diff --git a/.../main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java b/.../main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java
@@ -2,6 +2,7 @@
 
 import com.evolveum.midpoint.audit.api.AuditEventRecord;
 import com.evolveum.midpoint.web.component.data.BaseSortableDataProvider;
+import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventRecordType;
 import org.apache.wicket.Component;
 import org.apache.wicket.model.IModel;
@@ -43,15 +44,16 @@ public List<AuditEventRecordType> getObject() {
                 return listRecords(auditEventQuery, true);
             }
 
-            @Override
-            public void setObject(List<AuditEventRecordType> auditEventRecordTypes) {
-
-            }
-
             @Override
             public void detach() {
 
             }
+
+			@Override
+			public void setObject(List<AuditEventRecordType> object) {
+				// TODO Auto-generated method stub
+
+			}
         };
     }