diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/IconedObjectNamePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/IconedObjectNamePanel.html index b187422e8e6..e6fd9f9133c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/IconedObjectNamePanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/IconedObjectNamePanel.html @@ -17,9 +17,9 @@ -
-
-
+
+
+
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/IconedObjectNamePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/IconedObjectNamePanel.java index 8c70ef17dac..6c3ffe65aa7 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/IconedObjectNamePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/IconedObjectNamePanel.java @@ -23,6 +23,7 @@ import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; import com.evolveum.midpoint.prism.PrismObject; import com.evolveum.midpoint.schema.result.OperationResult; +import com.evolveum.midpoint.web.component.data.column.ColumnUtils; import com.evolveum.midpoint.web.component.data.column.ImagePanel; import com.evolveum.midpoint.web.component.util.VisibleBehaviour; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; @@ -84,9 +85,16 @@ private void initLayout(){ setOutputMarkupId(true); DisplayType displayType = WebComponentUtil.getArchetypePolicyDisplayType(referencedObjectModel.getObject(), getPageBase()); + if (displayType == null){ + displayType = new DisplayType(); + } + if (displayType.getIcon() == null){ + displayType.setIcon(WebComponentUtil.createIconType(WebComponentUtil.createDefaultBlackIcon( + WebComponentUtil.classToQName(getPageBase().getPrismContext(), referencedObjectModel.getObject().getClass())))); + } ImagePanel imagePanel = new ImagePanel(ID_ICON, displayType); imagePanel.setOutputMarkupId(true); - imagePanel.add(new VisibleBehaviour(() -> displayType != null && displayType.getIcon() != null && StringUtils.isNotEmpty(displayType.getIcon().getCssClass()))); +// imagePanel.add(new VisibleBehaviour(() -> displayType != null && displayType.getIcon() != null && StringUtils.isNotEmpty(displayType.getIcon().getCssClass()))); add(imagePanel); Label nameLabel = new Label(ID_NAME, Model.of(WebComponentUtil.getEffectiveName(referencedObjectModel.getObject(), AbstractRoleType.F_DISPLAY_NAME))); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemDetailsPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemDetailsPanel.html index 2aef8b3e307..e639e73cee6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemDetailsPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemDetailsPanel.html @@ -35,24 +35,23 @@ - + - + - + - + + + + + + + - - - - - - -
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemDetailsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemDetailsPanel.java index 72b0d9331dc..fd1e24e1f95 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemDetailsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemDetailsPanel.java @@ -26,9 +26,13 @@ import com.evolveum.midpoint.web.component.data.IconedObjectNamePanel; import com.evolveum.midpoint.web.component.prism.show.SceneDto; import com.evolveum.midpoint.web.component.prism.show.ScenePanel; +import com.evolveum.midpoint.web.page.admin.workflow.dto.WorkItemDto; import com.evolveum.midpoint.xml.ns._public.common.common_3.*; +import org.apache.wicket.markup.html.WebMarkupContainer; +import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; +import org.apache.wicket.model.PropertyModel; /** * Created by honchar @@ -88,6 +92,8 @@ private void initLayout(){ target.setOutputMarkupId(true); add(target); + add(new Label(ID_COMMENT, CaseTypeUtil.getRequesterComment(CaseTypeUtil.getCase(getModelObject())))); + CaseType parentCase = CaseTypeUtil.getCase(getModelObject()); EvaluatedTriggerGroupListPanel reasonPanel = new EvaluatedTriggerGroupListPanel(ID_REASON, Model.ofList(WebComponentUtil.computeTriggers(parentCase != null ? parentCase.getApprovalContext() : null, @@ -97,6 +103,5 @@ private void initLayout(){ add(new ScenePanel(ID_DELTAS_TO_APPROVE, sceneModel)); - } } diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CaseTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CaseTypeUtil.java index c180b803ace..1adef6b9bb2 100644 --- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CaseTypeUtil.java +++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CaseTypeUtil.java @@ -23,6 +23,7 @@ import com.evolveum.midpoint.schema.constants.SchemaConstants; import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseType; import com.evolveum.midpoint.xml.ns._public.common.common_3.CaseWorkItemType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationBusinessContextType; import org.jetbrains.annotations.NotNull; import javax.xml.datatype.XMLGregorianCalendar; @@ -63,4 +64,9 @@ public static boolean isClosed(CaseType aCase) { public static XMLGregorianCalendar getStartTimestamp(CaseType aCase) { return aCase != null && aCase.getMetadata() != null ? aCase.getMetadata().getCreateTimestamp() : null; } + + public static String getRequesterComment(CaseType aCase) { + OperationBusinessContextType businessContext = ApprovalContextUtil.getBusinessContext(aCase); + return businessContext != null ? businessContext.getComment() : null; + } }