From 19388c5a7399930197e17863f1f69af1a08972f0 Mon Sep 17 00:00:00 2001 From: ozkanbayraktar Date: Thu, 13 Oct 2016 16:47:30 +0200 Subject: [PATCH 1/4] columns in the table of the PageAuditRecorViewer are adjusted --- .../admin/reports/PageAuditLogViewer.java | 105 ++++++++++-------- .../admin/reports/dto/AuditSearchDto.java | 26 +++-- 2 files changed, 75 insertions(+), 56 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java index 7bc55f3ee57..43b7b2ac78f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.java @@ -10,6 +10,7 @@ import javax.xml.namespace.QName; import org.apache.wicket.AttributeModifier; +import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; @@ -18,6 +19,7 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.EnumChoiceRenderer; import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.RepeatingView; import org.apache.wicket.model.IModel; @@ -25,7 +27,6 @@ import org.apache.wicket.model.PropertyModel; import org.apache.wicket.model.util.ListModel; -import com.evolveum.midpoint.audit.api.AuditEventRecord; import com.evolveum.midpoint.gui.api.page.PageBase; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; @@ -34,10 +35,10 @@ import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.security.api.AuthorizationConstants; import com.evolveum.midpoint.util.QNameUtil; -import com.evolveum.midpoint.util.exception.SchemaException; import com.evolveum.midpoint.web.application.AuthorizationAction; import com.evolveum.midpoint.web.application.PageDescriptor; import com.evolveum.midpoint.web.component.AjaxButton; +import com.evolveum.midpoint.web.component.DateInput; 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; @@ -70,9 +71,7 @@ description = "PageAuditLogViewer.auth.auditLogViewer.description")}) public class PageAuditLogViewer extends PageBase{ - private List auditEventRecordList; - - Map params = new HashMap<>(); + private static final long serialVersionUID = 1L; private static final String ID_PARAMETERS_PANEL = "parametersPanel"; private static final String ID_TABLE = "table"; @@ -81,8 +80,8 @@ public class PageAuditLogViewer extends PageBase{ private static final String ID_INITIATOR_NAME = "initiatorNameField"; private static final String ID_CHANNEL = "channelField"; private static final String ID_HOST_IDENTIFIER = "hostIdentifierField"; - private static final String ID_TARGET_NAME = "targetNameField"; - private static final String ID_TARGET_OWNER_NAME = "targetOwnerNameField"; + // private static final String ID_TARGET_NAME = "targetNameField"; + // private static final String ID_TARGET_OWNER_NAME = "targetOwnerNameField"; private static final String ID_EVENT_TYPE = "eventTypeField"; private static final String ID_EVENT_STAGE = "eventStageField"; private static final String ID_OUTCOME = "outcomeField"; @@ -93,7 +92,7 @@ public class PageAuditLogViewer extends PageBase{ private IModel auditSearchDto; public PageAuditLogViewer(){ - auditSearchDto = new Model(new AuditSearchDto()); + auditSearchDto = new Model(new AuditSearchDto()); initLayout(); } @@ -110,67 +109,75 @@ private void initParametersPanel(Form mainForm){ parametersPanel.setOutputMarkupId(true); mainForm.add(parametersPanel); - PropertyModel fromModel = new PropertyModel<>(auditSearchDto, AuditSearchDto.F_FROM_GREG); + PropertyModel fromModel = new PropertyModel(auditSearchDto, AuditSearchDto.F_FROM_GREG); DatePanel from = new DatePanel(ID_FROM, fromModel); from.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior()); from.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); + // from.get("date").add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); + // from.get("hours").add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); + // from.get("minutes").add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); + // from.get("amOrPmChoice").add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); from.setOutputMarkupId(true); parametersPanel.add(from); - PropertyModel toModel = new PropertyModel<>(auditSearchDto, AuditSearchDto.F_TO_GREG); + PropertyModel toModel = new PropertyModel(auditSearchDto, AuditSearchDto.F_TO_GREG); DatePanel to = new DatePanel(ID_TO, toModel); to.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior()); to.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); + // to.get("date").add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); + // to.get("hours").add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); + // to.get("minutes").add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); + // to.get("amOrPmChoice").add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); to.setOutputMarkupId(true); parametersPanel.add(to); - // PropertyModel initiatorNameModel = new PropertyModel<>(auditSearchDto, AuditSearchDto.F_INITIATOR_NAME); - // TextPanel initiatorName = new TextPanel(ID_INITIATOR_NAME, initiatorNameModel); + // PropertyModel initiatorNameModel = new PropertyModel(auditSearchDto, AuditSearchDto.F_INITIATOR_NAME); + // TextPanel initiatorName = new TextPanel(ID_INITIATOR_NAME, initiatorNameModel); // initiatorName.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior()); // initiatorName.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); // initiatorName.setOutputMarkupId(true); // parametersPanel.add(initiatorName); - PropertyModel hostIdentifierModel = new PropertyModel<>(auditSearchDto, AuditSearchDto.F_HOST_IDENTIFIER); - TextPanel hostIdentifier = new TextPanel(ID_HOST_IDENTIFIER, hostIdentifierModel); + PropertyModel hostIdentifierModel = new PropertyModel(auditSearchDto, AuditSearchDto.F_HOST_IDENTIFIER); + TextPanel hostIdentifier = new TextPanel(ID_HOST_IDENTIFIER, hostIdentifierModel); hostIdentifier.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior()); hostIdentifier.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); hostIdentifier.setOutputMarkupId(true); parametersPanel.add(hostIdentifier); - // PropertyModel targetNameModel = new PropertyModel<>(auditSearchDto, AuditSearchDto.F_TARGET_NAME); - // TextPanel targetName = new TextPanel(ID_TARGET_NAME, targetNameModel); + // PropertyModel targetNameModel = new PropertyModel(auditSearchDto, AuditSearchDto.F_TARGET_NAME); + // TextPanel targetName = new TextPanel(ID_TARGET_NAME, targetNameModel); // targetName.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior()); // targetName.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); // targetName.setOutputMarkupId(true); // parametersPanel.add(targetName); - // PropertyModel targetOwnerNameModel = new PropertyModel<>(auditSearchDto, AuditSearchDto.F_TARGET_OWNER_NAME); - // TextPanel targetOwnerName = new TextPanel(ID_TARGET_OWNER_NAME, targetOwnerNameModel); + // PropertyModel targetOwnerNameModel = new PropertyModel(auditSearchDto, AuditSearchDto.F_TARGET_OWNER_NAME); + // TextPanel targetOwnerName = new TextPanel(ID_TARGET_OWNER_NAME, targetOwnerNameModel); // targetOwnerName.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior()); // targetOwnerName.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); // targetOwnerName.setOutputMarkupId(true); // parametersPanel.add(targetOwnerName); - ListModel eventTypeListModel = new ListModel(Arrays.asList(AuditEventTypeType.values())); - PropertyModel eventTypeModel = new PropertyModel<>(auditSearchDto, AuditSearchDto.F_EVENT_TYPE); - DropDownChoicePanel eventType = new DropDownChoicePanel(ID_EVENT_TYPE, eventTypeModel, eventTypeListModel, new EnumChoiceRenderer(), true); + ListModel eventTypeListModel = new ListModel(Arrays.asList(AuditEventTypeType.values())); + PropertyModel eventTypeModel = new PropertyModel(auditSearchDto, AuditSearchDto.F_EVENT_TYPE); + DropDownChoicePanel eventType = new DropDownChoicePanel(ID_EVENT_TYPE, eventTypeModel, eventTypeListModel, new EnumChoiceRenderer(), true); eventType.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior()); eventType.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); eventType.setOutputMarkupId(true); parametersPanel.add(eventType); - ListModel eventStageListModel = new ListModel(Arrays.asList(AuditEventStageType.values())); - PropertyModel eventStageModel = new PropertyModel<>(auditSearchDto, AuditSearchDto.F_EVENT_STAGE); - DropDownChoicePanel eventStage = new DropDownChoicePanel(ID_EVENT_STAGE, eventStageModel, eventStageListModel, new EnumChoiceRenderer(), true); + ListModel eventStageListModel = new ListModel(Arrays.asList(AuditEventStageType.values())); + PropertyModel eventStageModel = new PropertyModel(auditSearchDto, AuditSearchDto.F_EVENT_STAGE); + DropDownChoicePanel eventStage = new DropDownChoicePanel(ID_EVENT_STAGE, eventStageModel, eventStageListModel, new EnumChoiceRenderer(), true); eventStage.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior()); eventStage.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); eventStage.setOutputMarkupId(true); parametersPanel.add(eventStage); - ListModel outcomeListModel = new ListModel(Arrays.asList(OperationResultStatusType.values())); - PropertyModel outcomeModel = new PropertyModel<>(auditSearchDto, AuditSearchDto.F_OUTCOME); - DropDownChoicePanel outcome = new DropDownChoicePanel(ID_OUTCOME, outcomeModel, outcomeListModel, new EnumChoiceRenderer(), true); + ListModel outcomeListModel = new ListModel(Arrays.asList(OperationResultStatusType.values())); + PropertyModel outcomeModel = new PropertyModel(auditSearchDto, AuditSearchDto.F_OUTCOME); + DropDownChoicePanel outcome = new DropDownChoicePanel(ID_OUTCOME, outcomeModel, outcomeListModel, new EnumChoiceRenderer(), true); outcome.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior()); outcome.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); outcome.setOutputMarkupId(true); @@ -187,15 +194,16 @@ private void initParametersPanel(Form mainForm){ channelQnameList.add(channelQName); } } - ListModel channelListModel = new ListModel(channelQnameList); - PropertyModel channelModel = new PropertyModel<>(auditSearchDto, AuditSearchDto.F_CHANNEL); - DropDownChoicePanel channel = new DropDownChoicePanel(ID_CHANNEL, channelModel, channelListModel, new QNameChoiceRenderer(), true); + ListModel channelListModel = new ListModel(channelQnameList); + PropertyModel channelModel = new PropertyModel(auditSearchDto, AuditSearchDto.F_CHANNEL); + DropDownChoicePanel channel = new DropDownChoicePanel(ID_CHANNEL, channelModel, channelListModel, new QNameChoiceRenderer(), true); channel.getBaseFormComponent().add(new EmptyOnChangeAjaxFormUpdatingBehavior()); channel.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); channel.setOutputMarkupId(true); parametersPanel.add(channel); AjaxButton ajaxButton = new AjaxButton(ID_SEARCH_BUTTON, createStringResource("BasicSearchPanel.search")) { + private static final long serialVersionUID = 1L; @Override public void onClick(AjaxRequestTarget arg0) { Form mainForm = (Form)getParent().getParent(); @@ -219,9 +227,12 @@ private void initTable(Form mainForm){ } private void refreshTable(Form mainForm){ - AuditEventRecordProvider provider = new AuditEventRecordProvider(PageAuditLogViewer.this){ + AuditEventRecordProvider provider = new AuditEventRecordProvider(PageAuditLogViewer.this) { + private static final long serialVersionUID = 1L; public Map getParameters() { Map parameters = new HashMap(); + // System.out.println(auditSearchDto.getObject().getFromGreg()); + // System.out.println(auditSearchDto.getObject().getToGreg()); parameters.put("from", auditSearchDto.getObject().getFromGreg()); parameters.put("to", auditSearchDto.getObject().getToGreg()); // parameters.put("initiatorName", auditSearchDto.getObject().getInitiatorName()); @@ -237,7 +248,7 @@ public Map getParameters() { parameters.put("outcome", auditSearchDto.getObject().getOutcome()); return parameters; } - }; + }; BoxedTablePanel table = new BoxedTablePanel(ID_TABLE, provider, initColumns(), UserProfileStorage.TableId.PAGE_AUDIT_LOG_VIEWER, @@ -248,9 +259,10 @@ public Map getParameters() { } private List> initColumns() { - List> columns = new ArrayList<>(); + List> columns = new ArrayList>(); IColumn linkColumn = - new LinkColumn(createStringResource("PageAuditLogViewer.column.time"), "timestamp"){ + new LinkColumn(createStringResource("PageAuditLogViewer.column.time"), "timestamp") { + private static final long serialVersionUID = 1L; @Override public void onClick(AjaxRequestTarget target, IModel rowModel) { setResponsePage(new PageAuditLogDetails(rowModel.getObject())); @@ -263,10 +275,11 @@ public void populateItem(Item> cellItem, St } }; columns.add(linkColumn); - // IColumn timeColumn = new PropertyColumn(createStringResource("PageAuditLogViewer.column.time"), "timestamp"); + // IColumn timeColumn = new PropertyColumn(createStringResource("PageAuditLogViewer.column.time"), "timestamp"); // columns.add(timeColumn); - IColumn initiatorColumn = new PropertyColumn(createStringResource("PageAuditLogViewer.column.initiatorRef"), "initiatorRef"){ + IColumn initiatorColumn = new PropertyColumn(createStringResource("PageAuditLogViewer.column.initiatorRef"), "initiatorRef") { + private static final long serialVersionUID = 1L; @Override public void populateItem(Item item, String componentId, IModel rowModel) { AuditEventRecordType auditEventRecordType = (AuditEventRecordType)rowModel.getObject(); @@ -281,7 +294,8 @@ public void populateItem(Item item, String componentId, IModel rowModel) { } }; columns.add(initiatorColumn); - IColumn taskIdentifierColumn = new PropertyColumn(createStringResource("PageAuditLogViewer.column.taskIdentifier"), "taskIdentifier"){ + IColumn taskIdentifierColumn = new PropertyColumn(createStringResource("PageAuditLogViewer.column.taskIdentifier"), "taskIdentifier") { + private static final long serialVersionUID = 1L; @Override public void populateItem(Item item, String componentId, IModel rowModel) { item.add(new AttributeModifier("style", new Model("width: 10%;"))); @@ -289,7 +303,8 @@ public void populateItem(Item item, String componentId, IModel rowModel) { } }; columns.add(taskIdentifierColumn); - IColumn channelColumn = new PropertyColumn(createStringResource("PageAuditLogViewer.column.channel"), "channel"){ + IColumn channelColumn = new PropertyColumn(createStringResource("PageAuditLogViewer.column.channel"), "channel") { + private static final long serialVersionUID = 1L; @Override public void populateItem(Item item, String componentId, IModel rowModel) { AuditEventRecordType auditEventRecordType = (AuditEventRecordType)rowModel.getObject(); @@ -298,7 +313,7 @@ public void populateItem(Item item, String componentId, IModel rowModel) { { QName channelQName = QNameUtil.uriToQName(channel); String return_ = channelQName.getLocalPart(); - item.add(new Label(componentId, return_)); + item.add(new Label(componentId, return_)); } else { @@ -308,7 +323,8 @@ public void populateItem(Item item, String componentId, IModel rowModel) { } }; columns.add(channelColumn); - IColumn deltaColumn = new PropertyColumn(createStringResource("PageAuditLogViewer.column.delta"), "delta"){ + IColumn deltaColumn = new PropertyColumn(createStringResource("PageAuditLogViewer.column.delta"), "delta"){ + private static final long serialVersionUID = 1L; @Override public void populateItem(Item item, String componentId, IModel rowModel) { RepeatingView repeatingView = new RepeatingView(componentId); @@ -321,13 +337,14 @@ public void populateItem(Item item, String componentId, IModel rowModel) { try { ObjectDelta objectDelta = DeltaConvertor.createObjectDelta(objectDeltaType, getPrismContext()); - repeatingView.add(new Label(componentId, objectDelta.toString())); + repeatingView.add(new Label(repeatingView.newChildId(), objectDelta.toString())); } - catch (SchemaException e) + catch (Exception e) { - e.printStackTrace(); + repeatingView.add(new Label(repeatingView.newChildId(), + "[Convertion from objectDeltaType to ObjectDelta fails]: " + objectDeltaType.toString())); } - } + } item.add(repeatingView); } }; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditSearchDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditSearchDto.java index 0e063aa5ab3..9ca2384c41e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditSearchDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditSearchDto.java @@ -37,8 +37,8 @@ public class AuditSearchDto implements Serializable { public static final String F_FROM_GREG = "fromGreg"; public static final String F_TO_GREG = "toGreg"; - public static final String F_FROM = "from"; - public static final String F_TO = "to"; + // public static final String F_FROM = "from"; + // public static final String F_TO = "to"; public static final String F_INITIATOR_NAME = "initiatorName"; public static final String F_CHANNEL = "channel"; public static final String F_HOST_IDENTIFIER = "hostIdentifier"; @@ -50,8 +50,8 @@ public class AuditSearchDto implements Serializable { private XMLGregorianCalendar fromGreg; private XMLGregorianCalendar toGreg; - private Date from; - private Date to; + // private Date from; + // private Date to; private String initiatorName; // private String channel; private QName channel; @@ -63,24 +63,26 @@ public class AuditSearchDto implements Serializable { private OperationResultStatusType outcome; public XMLGregorianCalendar getFromGreg() { - return MiscUtil.asXMLGregorianCalendar(from); + // return MiscUtil.asXMLGregorianCalendar(from); + return fromGreg; } public void setFromGreg(XMLGregorianCalendar fromGreg) { - this.from = MiscUtil.asDate(fromGreg); + // this.from = MiscUtil.asDate(fromGreg); this.fromGreg = fromGreg; } public XMLGregorianCalendar getToGreg() { - return MiscUtil.asXMLGregorianCalendar(to); + // return MiscUtil.asXMLGregorianCalendar(to); + return toGreg; } public void setToGreg(XMLGregorianCalendar toGreg) { - this.to = MiscUtil.asDate(toGreg); + // this.to = MiscUtil.asDate(toGreg); this.toGreg = toGreg; } - public Date getFrom() { + /*public Date getFrom() { if (from == null) { from = new Date(); } @@ -100,15 +102,15 @@ public Date getTo() { public void setTo(Date to) { this.to = to; - } + }*/ - public Timestamp getDateFrom() { + /*public Timestamp getDateFrom() { return new Timestamp(getFrom().getTime()); } public Timestamp getDateTo() { return new Timestamp(getTo().getTime()); - } + }*/ public String getInitiatorName() { return initiatorName; From 5aeb18359e07cc69118668a853b821c40431ec34 Mon Sep 17 00:00:00 2001 From: ardanu Date: Thu, 13 Oct 2016 17:24:59 +0200 Subject: [PATCH 2/4] modified midpoint.properties --- .../admin/reports/PageAuditLogDetails.html | 165 +++++++++--------- .../admin/reports/PageAuditLogDetails.java | 113 +++++++----- 2 files changed, 155 insertions(+), 123 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html index 6dc5679ad84..7ba9858cf77 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html @@ -14,87 +14,94 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + - + -
+
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- -
-
- - +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java index c50dfae2891..1652b2af951 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java @@ -7,6 +7,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.repeater.RepeatingView; import org.apache.wicket.model.AbstractPropertyModel; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; @@ -27,6 +28,7 @@ import com.evolveum.midpoint.web.application.AuthorizationAction; import com.evolveum.midpoint.web.application.PageDescriptor; import com.evolveum.midpoint.web.component.input.TextPanel; +import com.evolveum.midpoint.web.component.model.delta.DeltaPanel; import com.evolveum.midpoint.web.component.prism.show.SceneDto; import com.evolveum.midpoint.web.component.prism.show.ScenePanel; import com.evolveum.midpoint.web.component.prism.show.WrapperScene; @@ -34,6 +36,7 @@ import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventRecordType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectDeltaOperationType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultType; import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType; @@ -46,12 +49,14 @@ label = "PageAuditLogViewer.auth.auditLogViewer.label", description = "PageAuditLogViewer.auth.auditLogViewer.description")}) public class PageAuditLogDetails extends PageBase{ - + private static final Trace LOGGER = TraceManager.getTrace(PageNewReport.class); private static final long serialVersionUID = 1L; private static final String ID_EVENT_PANEL = "eventPanel"; private static final String ID_DELTA_PANEL = "deltaPanel"; + private static final String ID_DELTA_LIST_PANEL = "deltaListPanel"; + private static final String ID_OBJECT_DELTA_OP_PANEL ="objectDeltaOpPanel"; private static final String ID_EVENT_DETAILS_PANEL = "eventDetailsPanel"; private static final String ID_PARAMETERS_TIMESTAMP = "timestamp"; private static final String ID_PARAMETERS_EVENT_IDENTIFIER = "eventIdentifier"; @@ -69,14 +74,14 @@ public class PageAuditLogDetails extends PageBase{ private static final String ID_PARAMETERS_EVENT_RESULT = "result"; private static final String ID_PARAMETERS_PARAMETER = "parameter"; private static final String ID_PARAMETERS_MESSAGE = "message"; - + private static final String ID_PARAMETERS_DELTA = "delta"; + private static final String ID_PARAMETERS_DELTA_SCENE = "deltaScene"; private static final String ID_PARAMETERS_EXECUTION_RESULT ="executionResult"; private static final String ID_PARAMETERS_OBJECT_NAME ="objectName"; - private static final String ID_PARAMETERS_RESOURCE_OID ="resourceOid"; private static final String ID_PARAMETERS_RESOURCE_NAME ="resourceName"; - private static final String ID_PARAMETERS_DELTA_KEY ="deltaKey"; private static final String ID_PARAMETERS_DELTA_PARAMETERS ="deltaParams"; + private List deltas = null; @@ -87,7 +92,7 @@ public class PageAuditLogDetails extends PageBase{ private IModel recordModel; -// private IModel deltaModel; + // private IModel deltaModel; public PageAuditLogDetails(final AuditEventRecordType recordType) { @@ -98,22 +103,25 @@ protected AuditEventRecordType load() { return recordType; } }; - - + + initLayout(); } private void initLayout(){ - - initEventPanel(); - initDeltasPanel(); + WebMarkupContainer eventPanel = new WebMarkupContainer(ID_EVENT_PANEL); + initEventPanel(eventPanel); + initDeltasPanel(eventPanel); } - WebMarkupContainer eventPanel = new WebMarkupContainer(ID_EVENT_PANEL); - private void initEventPanel(){ + + + + private void initEventPanel(WebMarkupContainer eventPanel){ + eventPanel.setOutputMarkupId(true); add(eventPanel); @@ -191,41 +199,58 @@ private void initEventPanel(){ message.setOutputMarkupId(true); eventDetailsPanel.add(message); } - private void initDeltasPanel(){ + private void initDeltasPanel(WebMarkupContainer eventPanel){ List deltas = recordModel.getObject().getDelta(); List scenes= new ArrayList (deltas.size()); + RepeatingView deltaScene = new RepeatingView(ID_PARAMETERS_DELTA_SCENE); + for(ObjectDeltaOperationType deltaOp :deltas){ - - ObjectDeltaType od = deltaOp.getObjectDelta(); - ObjectDelta delta; - try { - delta = DeltaConvertor.createObjectDelta(od, getPrismContext()); - Scene scene = getModelInteractionService().visualizeDelta( delta, createSimpleTask(ID_PARAMETERS_DELTA), new OperationResult(ID_PARAMETERS_DELTA)); - scenes.add(scene); - } catch (SchemaException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - LOGGER.error("error when converitng to DeltaObject."); - throw new RestartResponseException(this); - } - } - - WrapperScene ws = new WrapperScene(scenes, createStringResource("PageAuditLogDetails.deltaKey").getObject(), ID_PARAMETERS_DELTA_PARAMETERS); - final SceneDto deltaSceneDto = new SceneDto(ws); - deltaSceneDto.setMinimized(true); - - IModel deltaModel = new AbstractReadOnlyModel(){ - public SceneDto getObject() { - return deltaSceneDto; - } - - }; + WebMarkupContainer objectDeltaOperationPanel = new WebMarkupContainer(deltaScene.newChildId()); + ObjectDeltaType od = deltaOp.getObjectDelta(); + + Label executionResult = new Label(ID_PARAMETERS_EXECUTION_RESULT, new PropertyModel(deltaOp.getExecutionResult(),ID_PARAMETERS_EXECUTION_RESULT)); + executionResult.setOutputMarkupId(true); + objectDeltaOperationPanel.add(executionResult); + + Label resourceName = new Label(ID_PARAMETERS_RESOURCE_NAME, new PropertyModel(deltaOp.getExecutionResult(),ID_PARAMETERS_RESOURCE_NAME)); + resourceName.setOutputMarkupId(true); + objectDeltaOperationPanel.add(resourceName); + + Label objectName = new Label(ID_PARAMETERS_OBJECT_NAME, new PropertyModel(deltaOp.getExecutionResult(),ID_PARAMETERS_OBJECT_NAME)); + objectName.setOutputMarkupId(true); + objectDeltaOperationPanel.add(objectName); + + + ObjectDelta delta; + try { + delta = DeltaConvertor.createObjectDelta(od, getPrismContext()); + Scene scene = getModelInteractionService().visualizeDelta( delta, createSimpleTask(ID_PARAMETERS_DELTA), new OperationResult(ID_PARAMETERS_DELTA)); + final SceneDto deltaSceneDto = new SceneDto(scene); + deltaSceneDto.setMinimized(true); + IModel deltaModel = new AbstractReadOnlyModel(){ + public SceneDto getObject() { + return deltaSceneDto; + } + + }; + ScenePanel deltaPanel = new ScenePanel(ID_DELTA_PANEL, deltaModel); + deltaPanel.setOutputMarkupId(true); + objectDeltaOperationPanel.add(deltaPanel); - ScenePanel deltaPanel = new ScenePanel(ID_DELTA_PANEL, deltaModel); - deltaPanel.setOutputMarkupId(true); - eventPanel.add(deltaPanel); - - + + } catch (SchemaException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + LOGGER.error("error when conveting to DeltaObject."); + throw new RestartResponseException(this); + } + deltaScene.add(objectDeltaOperationPanel); + } + WebMarkupContainer deltaListPanel = new WebMarkupContainer(ID_DELTA_LIST_PANEL); + deltaListPanel.add(deltaScene); + eventPanel.add(deltaListPanel); + } - + + } From fe06773dd8bd25de0adb1e7688e7e7fee16058c1 Mon Sep 17 00:00:00 2001 From: ardanu Date: Thu, 13 Oct 2016 17:44:54 +0200 Subject: [PATCH 3/4] changed delta details panel --- .../midpoint/web/page/admin/reports/PageAuditLogDetails.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html index 7ba9858cf77..59462d65b21 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html @@ -97,8 +97,8 @@
-
-
+ +
From 739863c1e7e7670196f6671594e763d0b9a65c43 Mon Sep 17 00:00:00 2001 From: Katarina Valalikova Date: Fri, 14 Oct 2016 09:26:10 +0200 Subject: [PATCH 4/4] fixing audit log details page, audit record provider paging --- .../delta/ObjectDeltaOperationPanel.html | 39 +++++ .../delta/ObjectDeltaOperationPanel.java | 153 ++++++++++++++++++ .../admin/reports/PageAuditLogDetails.html | 7 +- .../admin/reports/PageAuditLogDetails.java | 85 ++-------- .../reports/dto/AuditEventRecordProvider.java | 4 +- .../localization/Midpoint.properties | 3 + 6 files changed, 214 insertions(+), 77 deletions(-) create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.html create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.html new file mode 100644 index 00000000000..39c30049052 --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.html @@ -0,0 +1,39 @@ + + + + +
+ + + + + + + + + + + + + +
+ +
+
+ + diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java new file mode 100644 index 00000000000..682d5d0f1a7 --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java @@ -0,0 +1,153 @@ +package com.evolveum.midpoint.gui.api.component.delta; + +import org.apache.wicket.AttributeModifier; +import org.apache.wicket.RestartResponseException; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.markup.html.WebMarkupContainer; +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.model.AbstractReadOnlyModel; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.PropertyModel; + +import com.evolveum.midpoint.gui.api.component.BasePanel; +import com.evolveum.midpoint.gui.api.page.PageBase; +import com.evolveum.midpoint.model.api.visualizer.Scene; +import com.evolveum.midpoint.prism.delta.ObjectDelta; +import com.evolveum.midpoint.schema.DeltaConvertor; +import com.evolveum.midpoint.schema.ObjectDeltaOperation; +import com.evolveum.midpoint.schema.result.OperationResult; +import com.evolveum.midpoint.util.exception.SchemaException; +import com.evolveum.midpoint.util.logging.Trace; +import com.evolveum.midpoint.util.logging.TraceManager; +import com.evolveum.midpoint.web.component.prism.show.SceneDto; +import com.evolveum.midpoint.web.component.prism.show.ScenePanel; +import com.evolveum.midpoint.web.component.prism.show.WrapperScene; +import com.evolveum.midpoint.web.page.admin.reports.PageNewReport; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectDeltaOperationType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultStatusType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultType; +import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType; + +public class ObjectDeltaOperationPanel extends BasePanel { + + private static final long serialVersionUID = 1L; + + private static final Trace LOGGER = TraceManager.getTrace(ObjectDeltaOperationPanel.class); + + private static final String ID_PARAMETERS_DELTA = "delta"; + private static final String ID_PARAMETERS_EXECUTION_RESULT = "executionResult"; + private static final String ID_PARAMETERS_OBJECT_NAME = "objectName"; + private static final String ID_PARAMETERS_RESOURCE_NAME = "resourceName"; + + private static final String ID_DELTA_PANEL = "deltaPanel"; + private static final String ID_OBJECT_DELTA_OPERATION_MARKUP = "objectDeltaOperationMarkup"; + PageBase parentPage; + + public ObjectDeltaOperationPanel(String id, IModel model, PageBase parentPage) { + super(id, model); + this.parentPage = parentPage; + initLayout(); + } + + private void initLayout() { + // ObjectDeltaType od = getModel().getObjectDelta(); + WebMarkupContainer objectDeltaOperationMarkup = new WebMarkupContainer(ID_OBJECT_DELTA_OPERATION_MARKUP); + objectDeltaOperationMarkup.setOutputMarkupId(true); + + objectDeltaOperationMarkup.add(AttributeModifier.append("class", new AbstractReadOnlyModel() { + + @Override + public String getObject() { + return getBoxCssClass(); + } + + })); + add(objectDeltaOperationMarkup); + + Label executionResult = new Label(ID_PARAMETERS_EXECUTION_RESULT, + new PropertyModel(getModel(), "executionResult.status")); + executionResult.setOutputMarkupId(true); + objectDeltaOperationMarkup.add(executionResult); + + Label resourceName = new Label(ID_PARAMETERS_RESOURCE_NAME, + new PropertyModel(getModel(), ObjectDeltaOperationType.F_RESOURCE_NAME.getLocalPart())); + resourceName.setOutputMarkupId(true); + objectDeltaOperationMarkup.add(resourceName); + + Label objectName = new Label(ID_PARAMETERS_OBJECT_NAME, + new PropertyModel(getModel(), ObjectDeltaOperationType.F_OBJECT_NAME.getLocalPart())); + objectName.setOutputMarkupId(true); + objectDeltaOperationMarkup.add(objectName); + + IModel deltaModel = new AbstractReadOnlyModel() { + private static final long serialVersionUID = 1L; + + public SceneDto getObject() { + return loadSceneForDelta(); + } + + }; + ScenePanel deltaPanel = new ScenePanel(ID_DELTA_PANEL, deltaModel) { + @Override + public void headerOnClickPerformed(AjaxRequestTarget target, IModel model) { + super.headerOnClickPerformed(target, model); +// model.getObject(); + target.add(ObjectDeltaOperationPanel.this); + } + }; + deltaPanel.setOutputMarkupId(true); + objectDeltaOperationMarkup.add(deltaPanel); + + } + + private String getBoxCssClass() { + if (getModel().getObject() == null) { + return " box-primary"; + } + + if (getModel().getObject().getExecutionResult() == null) { + return " box-primary"; + } + + if (getModel().getObject().getExecutionResult().getStatus() == null) { + return " box-primary"; + } + + OperationResultStatusType status = getModel().getObject().getExecutionResult().getStatus(); + switch (status) { + case PARTIAL_ERROR : + case FATAL_ERROR : return " box-danger"; + case WARNING : + case UNKNOWN : + case HANDLED_ERROR : return " box-warning"; + case IN_PROGRESS : return " box-primary"; + case NOT_APPLICABLE : return " box-primary"; + case SUCCESS : return " box-success"; + + } + return " box-primary"; + + } + + private SceneDto loadSceneForDelta() { + Scene scene = null; + + ObjectDelta delta; + try { + delta = DeltaConvertor.createObjectDelta(getModel().getObject().getObjectDelta(), + parentPage.getPrismContext()); + + scene = parentPage.getModelInteractionService().visualizeDelta(delta, + parentPage.createSimpleTask(ID_PARAMETERS_DELTA), + new OperationResult(ID_PARAMETERS_DELTA)); + } catch (SchemaException e) { + return null; + } + SceneDto deltaSceneDto = new SceneDto(scene); + deltaSceneDto.setMinimized(true); + return deltaSceneDto; + + } + +} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html index 59462d65b21..5693bdcb503 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html @@ -95,11 +95,8 @@
-
-
- - -
+
+
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java index 1652b2af951..26d1cc6be44 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java @@ -14,6 +14,7 @@ import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; +import com.evolveum.midpoint.gui.api.component.delta.ObjectDeltaOperationPanel; import com.evolveum.midpoint.gui.api.model.LoadableModel; import com.evolveum.midpoint.gui.api.page.PageBase; import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; @@ -50,11 +51,11 @@ description = "PageAuditLogViewer.auth.auditLogViewer.description")}) public class PageAuditLogDetails extends PageBase{ - private static final Trace LOGGER = TraceManager.getTrace(PageNewReport.class); + private static final Trace LOGGER = TraceManager.getTrace(PageAuditLogDetails.class); private static final long serialVersionUID = 1L; private static final String ID_EVENT_PANEL = "eventPanel"; - private static final String ID_DELTA_PANEL = "deltaPanel"; + private static final String ID_DELTA_LIST_PANEL = "deltaListPanel"; private static final String ID_OBJECT_DELTA_OP_PANEL ="objectDeltaOpPanel"; private static final String ID_EVENT_DETAILS_PANEL = "eventDetailsPanel"; @@ -75,25 +76,10 @@ public class PageAuditLogDetails extends PageBase{ private static final String ID_PARAMETERS_PARAMETER = "parameter"; private static final String ID_PARAMETERS_MESSAGE = "message"; - private static final String ID_PARAMETERS_DELTA = "delta"; - private static final String ID_PARAMETERS_DELTA_SCENE = "deltaScene"; - private static final String ID_PARAMETERS_EXECUTION_RESULT ="executionResult"; - private static final String ID_PARAMETERS_OBJECT_NAME ="objectName"; - private static final String ID_PARAMETERS_RESOURCE_NAME ="resourceName"; - private static final String ID_PARAMETERS_DELTA_PARAMETERS ="deltaParams"; - - private List deltas = null; - - - - - - - + private IModel recordModel; - // private IModel deltaModel; - + public PageAuditLogDetails(final AuditEventRecordType recordType) { recordModel = new LoadableModel(false) { @@ -104,13 +90,13 @@ protected AuditEventRecordType load() { } }; - - initLayout(); } private void initLayout(){ WebMarkupContainer eventPanel = new WebMarkupContainer(ID_EVENT_PANEL); + eventPanel.setOutputMarkupId(true); + add(eventPanel); initEventPanel(eventPanel); initDeltasPanel(eventPanel); } @@ -122,9 +108,6 @@ private void initLayout(){ private void initEventPanel(WebMarkupContainer eventPanel){ - - eventPanel.setOutputMarkupId(true); - add(eventPanel); WebMarkupContainer eventDetailsPanel = new WebMarkupContainer(ID_EVENT_DETAILS_PANEL); eventDetailsPanel.setOutputMarkupId(true); eventPanel.add(eventDetailsPanel); @@ -200,55 +183,17 @@ private void initEventPanel(WebMarkupContainer eventPanel){ eventDetailsPanel.add(message); } private void initDeltasPanel(WebMarkupContainer eventPanel){ - List deltas = recordModel.getObject().getDelta(); - List scenes= new ArrayList (deltas.size()); - RepeatingView deltaScene = new RepeatingView(ID_PARAMETERS_DELTA_SCENE); + List deltas = recordModel.getObject().getDelta(); + RepeatingView deltaScene = new RepeatingView(ID_DELTA_LIST_PANEL); for(ObjectDeltaOperationType deltaOp :deltas){ - WebMarkupContainer objectDeltaOperationPanel = new WebMarkupContainer(deltaScene.newChildId()); - ObjectDeltaType od = deltaOp.getObjectDelta(); - - Label executionResult = new Label(ID_PARAMETERS_EXECUTION_RESULT, new PropertyModel(deltaOp.getExecutionResult(),ID_PARAMETERS_EXECUTION_RESULT)); - executionResult.setOutputMarkupId(true); - objectDeltaOperationPanel.add(executionResult); - - Label resourceName = new Label(ID_PARAMETERS_RESOURCE_NAME, new PropertyModel(deltaOp.getExecutionResult(),ID_PARAMETERS_RESOURCE_NAME)); - resourceName.setOutputMarkupId(true); - objectDeltaOperationPanel.add(resourceName); - - Label objectName = new Label(ID_PARAMETERS_OBJECT_NAME, new PropertyModel(deltaOp.getExecutionResult(),ID_PARAMETERS_OBJECT_NAME)); - objectName.setOutputMarkupId(true); - objectDeltaOperationPanel.add(objectName); - - - ObjectDelta delta; - try { - delta = DeltaConvertor.createObjectDelta(od, getPrismContext()); - Scene scene = getModelInteractionService().visualizeDelta( delta, createSimpleTask(ID_PARAMETERS_DELTA), new OperationResult(ID_PARAMETERS_DELTA)); - final SceneDto deltaSceneDto = new SceneDto(scene); - deltaSceneDto.setMinimized(true); - IModel deltaModel = new AbstractReadOnlyModel(){ - public SceneDto getObject() { - return deltaSceneDto; - } - - }; - ScenePanel deltaPanel = new ScenePanel(ID_DELTA_PANEL, deltaModel); - deltaPanel.setOutputMarkupId(true); - objectDeltaOperationPanel.add(deltaPanel); - - - } catch (SchemaException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - LOGGER.error("error when conveting to DeltaObject."); - throw new RestartResponseException(this); - } - deltaScene.add(objectDeltaOperationPanel); + ObjectDeltaOperationPanel deltaPanel = new ObjectDeltaOperationPanel(deltaScene.newChildId(), Model.of(deltaOp), this); + deltaPanel.setOutputMarkupId(true); + deltaScene.add(deltaPanel); + + } - WebMarkupContainer deltaListPanel = new WebMarkupContainer(ID_DELTA_LIST_PANEL); - deltaListPanel.add(deltaScene); - eventPanel.add(deltaListPanel); + eventPanel.add(deltaScene); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java index 8d89b5394f4..74c2abdac46 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java @@ -63,11 +63,11 @@ public Iterator internalIterator(long first, long count) { if (queryParameters.containsKey(SET_FIRST_RESULT_PARAMETER)){ queryParameters.remove(SET_FIRST_RESULT_PARAMETER); } - queryParameters.put(SET_FIRST_RESULT_PARAMETER, ((Long) first).intValue()); + parameters.put(SET_FIRST_RESULT_PARAMETER, ((Long) first).intValue()); if (queryParameters.containsKey(SET_MAX_RESULTS_PARAMETER)){ queryParameters.remove(SET_MAX_RESULTS_PARAMETER); } - queryParameters.put(SET_MAX_RESULTS_PARAMETER, ((Long) count).intValue()); + parameters.put(SET_MAX_RESULTS_PARAMETER, ((Long) count).intValue()); List recordsList = listRecords(auditEventQuery, true); return recordsList.iterator(); diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties index aaf853cc0fd..d69ae594108 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint.properties @@ -3375,3 +3375,6 @@ PageAuditLogDetails.channel=Channel PageAuditLogDetails.parameter=Parameter PageAuditLogDetails.message=Message PageAuditLogDetails.deltaKey=Delta List +ObjectDeltaOperationType.resourceName=Resource name +ObjectDeltaOperationType.objectName=Object name +ObjectDeltaOperationType.executionResult=Execution result \ No newline at end of file