Merge branch 'master' into feature/schema-cleanup-4

Evolveum · Aug 30, 2019 · d1541d4 · d1541d4
2 parents 78bd4dd + 4819dee
commit d1541d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...src/main/java/com/evolveum/midpoint/gui/impl/prism/component/ExpressionPropertyPanel.java b/...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());
 		}

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java b/...dmin-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<Boolean> getEnabled() {
-                IModel<SelectableBean<CaseWorkItemType>> rowModel = ((ColumnMenuAction<SelectableBean<CaseWorkItemType>>)getAction()).getRowModel();
-                if (rowModel != null && rowModel.getObject() != null && rowModel.getObject().getValue() != null){
-                    CaseWorkItemType workItem = rowModel.getObject().getValue();
+                IModel<PrismContainerValueWrapper<CaseWorkItemType>> rowModel = ((ColumnMenuAction<PrismContainerValueWrapper<CaseWorkItemType>>)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();