fix for showing of triggers in Approval case(MID-6880)

Evolveum · Mar 10, 2021 · bf2d763 · bf2d763
1 parent a3abf19
commit bf2d763
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...n/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.html b/...n/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.html
@@ -31,6 +31,7 @@ <h3 class="box-title"><wicket:message key="ItemApprovalPanel.wholeProcess"/></h3
         </div>
         <div class="box-body">
             <div wicket:id="wholeProcess" />
+            <div wicket:id="triggers" style="margin-right:5px;margin-left: 5px;"/>
         </div>
     </div>
     <div style="padding-bottom:15px">   <!-- TODO use some css here -->

diff --git a/...n/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java b/...n/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java
@@ -10,11 +10,14 @@
 import java.util.Collections;
 import java.util.Optional;
 
-import org.apache.commons.collections.CollectionUtils;
+import com.evolveum.midpoint.web.page.admin.workflow.EvaluatedTriggerGroupPanel;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
 import org.jetbrains.annotations.Nullable;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
@@ -49,6 +52,7 @@ public class SwitchableApprovalProcessPreviewsPanel extends BasePanel<String> {
     private static final String ID_SHOW_WHOLE_PROCESS_CONTAINER = "showWholeProcessContainer";
     private static final String ID_SHOW_WHOLE_PROCESS = "showWholeProcess";
     private static final String ID_SHOW_WHOLE_PROCESS_HELP = "showWholeProcessHelp";
+    private static final String ID_TRIGGERS = "triggers";
 
     private LoadableModel<ApprovalSchemaExecutionInformationType> approvalExecutionInfoModel;
     private LoadableModel<ApprovalProcessExecutionInformationDto> nextStagesModel;
@@ -137,6 +141,7 @@ private void initLayout(IModel<Boolean> showNextStagesModel) {
 
         WebMarkupContainer wholeProcessContainer = new WebMarkupContainer(ID_WHOLE_PROCESS_CONTAINER);
         wholeProcessContainer.add(new ApprovalProcessExecutionInformationPanel(ID_WHOLE_PROCESS, wholeProcessModel));
+        wholeProcessContainer.add(new EvaluatedTriggerGroupPanel(ID_TRIGGERS, new PropertyModel<>(wholeProcessModel, ApprovalProcessExecutionInformationDto.F_TRIGGERS)));
         wholeProcessContainer.add(WebComponentUtil.createHelp(ID_WHOLE_PROCESS_HELP));
         wholeProcessContainer.add(new VisibleBehaviour(() -> displayedProcessInfoBox == ProcessInfoBox.WHOLE_PROCESS));
         add(wholeProcessContainer);