From 0d49aea97b2c0da4e509075e4f96a772e6f763f5 Mon Sep 17 00:00:00 2001 From: kate Date: Mon, 2 Sep 2019 11:22:04 +0200 Subject: [PATCH] MID-5694 audit log viewer search fix --- .../AutoCompleteItemDefinitionPanel.java | 7 ----- .../gui/api/component/path/ItemPathPanel.java | 27 ++++++++++++------- .../component/path/ItemPathSegmentPanel.java | 5 ++-- .../component/AuditLogViewerPanel.java | 1 + 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionPanel.java index aded7cb4246..9235d627fb3 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionPanel.java @@ -58,13 +58,6 @@ protected Iterator getChoices(String input) { } - @Override - protected void onConfigure() { - super.onConfigure(); - itemDefinitionAsStringModel.setObject(null); - } - - }; input.add(new OnChangeAjaxBehavior() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java index 0207268c03b..bf27c7bdd84 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java @@ -7,6 +7,7 @@ import javax.xml.namespace.QName; +import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -64,6 +65,16 @@ public ItemPathPanel(String id, ItemPathType itemPath) { } + @Override + protected void onConfigure(){ + super.onConfigure(); + if (getModelObject() == null || getModelObject().getItemDef() == null){ + ItemPathSegmentPanel itemPathSegmentPanel = getItemPathSegmentPanel(); + if (itemPathSegmentPanel != null){ + itemPathSegmentPanel.getBaseFormComponent().getDefaultModel().setObject(null); + } + } + } private void initLayout() { initItemPathPanel(); @@ -87,15 +98,7 @@ public boolean isVisible() { }); - ItemPathSegmentPanel itemDefPanel = new ItemPathSegmentPanel(ID_DEFINITION, - new IModel() { - - private static final long serialVersionUID = 1L; - public ItemPathDto getObject() { - return ItemPathPanel.this.getModelObject(); - } - - }) { + ItemPathSegmentPanel itemDefPanel = new ItemPathSegmentPanel(ID_DEFINITION, getModel()) { private static final long serialVersionUID = 1L; @@ -109,6 +112,7 @@ protected void onUpdateAutoCompletePanel(AjaxRequestTarget target) { ItemPathPanel.this.onUpdate(ItemPathPanel.this.getModelObject()); } }; + itemDefPanel.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); itemDefPanel.setOutputMarkupId(true); itemPathPanel.add(itemDefPanel); @@ -118,7 +122,6 @@ protected void onUpdateAutoCompletePanel(AjaxRequestTarget target) { @Override public void onClick(AjaxRequestTarget target) { refreshItemPathPanel(new ItemPathDto(ItemPathPanel.this.getModelObject()), true, target); - } }; @@ -287,4 +290,8 @@ protected void onUpdate(ItemPathDto itemPathDto) { } + protected ItemPathSegmentPanel getItemPathSegmentPanel(){ + return (ItemPathSegmentPanel) get(ID_ITEM_PATH).get(ID_DEFINITION); + } + } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java index 0337a17048b..33d4f26532d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java @@ -6,6 +6,7 @@ import javax.xml.namespace.QName; +import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnBlurAjaxFormUpdatingBehaviour; import org.apache.commons.lang.StringUtils; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -85,7 +86,7 @@ protected void onUpdateAutoComplete(AjaxRequestTarget target, } }; -// itemDefPanel.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); + itemDefPanel.getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour()); itemDefPanel.setOutputMarkupId(true); add(itemDefPanel); } @@ -146,7 +147,7 @@ public boolean validate() { } public Component getBaseFormComponent() { - return get(ID_DEFINITION); + return ((AutoCompleteItemDefinitionPanel)get(ID_DEFINITION)).getBaseFormComponent(); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java index f577ac53d73..f3df9456ce0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java @@ -29,6 +29,7 @@ import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; +import com.evolveum.midpoint.gui.api.component.path.ItemPathDto; import com.evolveum.midpoint.prism.path.ItemPath; import org.apache.wicket.AttributeModifier; import org.apache.wicket.ajax.AjaxRequestTarget;