From 0b82ef4a79c8fa222fc6de50476ddd216a413403 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Wed, 12 Feb 2020 16:03:01 +0000
Subject: [PATCH] Workflow Signals
(cherry picked from commit 4ac2e595eaeb6e9754b44e2a8388db9abacb5032)
---
entity/WorkflowSignal_entity/WorkflowSignal_entity.aod | 2 ++
.../recordcontainers/db/conditionProcess.js | 2 +-
.../WorkflowSignalEdit_view/WorkflowSignalEdit_view.aod | 8 ++++----
.../WorkflowSignalFilter_view.aod | 8 ++++----
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod b/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
index 90a3b92882d..29415919152 100644
--- a/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
+++ b/entity/WorkflowSignal_entity/WorkflowSignal_entity.aod
@@ -24,6 +24,7 @@
<entityParameter>
<name>ProcessDefinitionId_param</name>
<expose v="true" />
+ <mandatory v="true" />
</entityParameter>
<entityField>
<name>OBJECT_TYPE</name>
@@ -81,6 +82,7 @@
<entityParameter>
<name>ProcessDefinitionKey_param</name>
<expose v="true" />
+ <mandatory v="true" />
</entityParameter>
</entityFields>
<recordContainers>
diff --git a/entity/WorkflowSignal_entity/recordcontainers/db/conditionProcess.js b/entity/WorkflowSignal_entity/recordcontainers/db/conditionProcess.js
index cb352a5e45c..1bae28698e6 100644
--- a/entity/WorkflowSignal_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/WorkflowSignal_entity/recordcontainers/db/conditionProcess.js
@@ -1,6 +1,6 @@
import("Sql_lib");
import("system.result");
-var cond = newWhereIfSet("WORKFLOWSIGNAL.PROCESSDEFINITION_ID", "$param.ProcessDefinitionId_param");
+var cond = newWhereIfSet("WORKFLOWSIGNAL.PROCESSDEFINITION_KEY", "$param.ProcessDefinitionKey_param");
result.string(cond.toString());
\ No newline at end of file
diff --git a/neonView/WorkflowSignalEdit_view/WorkflowSignalEdit_view.aod b/neonView/WorkflowSignalEdit_view/WorkflowSignalEdit_view.aod
index 485a890ce1c..bc9418f3b33 100644
--- a/neonView/WorkflowSignalEdit_view/WorkflowSignalEdit_view.aod
+++ b/neonView/WorkflowSignalEdit_view/WorkflowSignalEdit_view.aod
@@ -18,14 +18,14 @@
<name>937b8a52-58ab-49d3-80c7-ea98310632dd</name>
<entityField>SIGNAL_NAME</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>eb71448c-b176-4b12-a4d7-a46e2f242020</name>
- <entityField>OBJECT_TYPE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>bc88a7a6-6843-40c0-86ad-265424e98fb1</name>
<entityField>TRIGGER_EVENT</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>eb71448c-b176-4b12-a4d7-a46e2f242020</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>648536a5-2327-433e-8867-a3d60a0f8787</name>
<entityField>OBJECT_CONDITION</entityField>
diff --git a/neonView/WorkflowSignalFilter_view/WorkflowSignalFilter_view.aod b/neonView/WorkflowSignalFilter_view/WorkflowSignalFilter_view.aod
index 9e428d07362..bee3e15b46d 100644
--- a/neonView/WorkflowSignalFilter_view/WorkflowSignalFilter_view.aod
+++ b/neonView/WorkflowSignalFilter_view/WorkflowSignalFilter_view.aod
@@ -17,14 +17,14 @@
<name>80fa7f03-9064-42f2-95bd-bebc23ca3e62</name>
<entityField>SIGNAL_NAME</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>44a02634-1b88-49e8-8125-5bc22e31683d</name>
- <entityField>OBJECT_TYPE</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>c23ed9c6-7baa-4742-ba1e-d771f98167d5</name>
<entityField>TRIGGER_EVENT</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>44a02634-1b88-49e8-8125-5bc22e31683d</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
--
GitLab