From 992a3aea1641b6d4c7d1068f82b9e9f7451f37c7 Mon Sep 17 00:00:00 2001 From: kate Date: Thu, 29 Aug 2019 16:20:41 +0200 Subject: [PATCH 1/2] MID-5696 fix ClassCastException when approving a work item --- .../web/page/admin/cases/CaseWorkItemsPanel.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java index 58a2544a20e..f2ab2b7094a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java @@ -35,15 +35,12 @@ import com.evolveum.midpoint.web.component.menu.cog.ButtonInlineMenuItem; import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem; import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction; -import com.evolveum.midpoint.web.component.util.SelectableBean; -import com.evolveum.midpoint.web.component.wf.WorkItemsPanel; import com.evolveum.midpoint.web.page.admin.workflow.PageAttorneySelection; import com.evolveum.midpoint.web.session.PageStorage; import com.evolveum.midpoint.web.session.UserProfileStorage; import com.evolveum.midpoint.web.util.OnePageParameterEncoder; import com.evolveum.midpoint.wf.util.ApprovalUtils; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; @@ -252,9 +249,9 @@ public String getButtonIconCssClass(){ @Override public IModel getEnabled() { - IModel> rowModel = ((ColumnMenuAction>)getAction()).getRowModel(); - if (rowModel != null && rowModel.getObject() != null && rowModel.getObject().getValue() != null){ - CaseWorkItemType workItem = rowModel.getObject().getValue(); + IModel> rowModel = ((ColumnMenuAction>)getAction()).getRowModel(); + if (rowModel != null && rowModel.getObject() != null && rowModel.getObject().getRealValue() != null){ + CaseWorkItemType workItem = rowModel.getObject().getRealValue(); return Model.of(!CaseTypeUtil.isClosed(CaseTypeUtil.getCase(workItem))); } else { return super.getEnabled(); From 4819dee1f7234b582d1b1a5301fcb3604f6f7117 Mon Sep 17 00:00:00 2001 From: kate Date: Fri, 30 Aug 2019 00:57:19 +0200 Subject: [PATCH 2/2] expression new value fix --- .../gui/impl/prism/component/ExpressionPropertyPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/component/ExpressionPropertyPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/component/ExpressionPropertyPanel.java index 55edb881b78..c3355cabb96 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/component/ExpressionPropertyPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/component/ExpressionPropertyPanel.java @@ -151,7 +151,7 @@ private void expressionValueAddPerformed(AjaxRequestTarget target, ExpressionVal getModelObject().getValues().clear(); getModelObject().getValues().add(newExpressionValueWrapper); -// getModelObject().getItem().setRealValue(newExpressionValue); + getModelObject().getItem().setRealValue(newExpressionValue); } catch (SchemaException ex){ LOGGER.error("Unable to create new expression value, ", ex.getLocalizedMessage()); }