diff --git a/.liquibase/Data_alias/basic/workflows/blob/unsubscribeInterest.png b/.liquibase/Data_alias/basic/workflows/blob/unsubscribeInterest.png new file mode 100644 index 0000000000000000000000000000000000000000..98a5d517c16d44b15fd89c9ab29cc85954e47264 Binary files /dev/null and b/.liquibase/Data_alias/basic/workflows/blob/unsubscribeInterest.png differ diff --git a/.liquibase/Data_alias/basic/workflows/blob/unsubscribeInterest.xml b/.liquibase/Data_alias/basic/workflows/blob/unsubscribeInterest.xml new file mode 100644 index 0000000000000000000000000000000000000000..8dc3661838293bf6a3dcbd7c56762896bc6da182 --- /dev/null +++ b/.liquibase/Data_alias/basic/workflows/blob/unsubscribeInterest.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.flowable.org/processdef"> + <process id="unsubscribeInterest" name="Unsubscribe Interest" isExecutable="true"> + <startEvent id="startEvent1" flowable:formFieldValidation="true"></startEvent> + <serviceTask id="sid-82168C15-ACC8-4369-A92F-A4F8A82EDDD7" name="Change interest link" flowable:class="de.adito.aditoweb.server.neon.workflow.WorkflowServiceTask"> + <extensionElements> + <flowable:field name="jditoProcess"> + <flowable:string><![CDATA[SetInterestLink_workflowService]]></flowable:string> + </flowable:field> + </extensionElements> + </serviceTask> + <sequenceFlow id="sid-7C8AD2EA-BD4C-4251-B369-DC80DA765953" sourceRef="startEvent1" targetRef="sid-82168C15-ACC8-4369-A92F-A4F8A82EDDD7"></sequenceFlow> + <endEvent id="sid-7C072C86-5A44-4054-833B-F7B39838C118"></endEvent> + <sequenceFlow id="sid-692F5534-B5CD-45AA-84DE-4BD5B0AC18BD" sourceRef="sid-82168C15-ACC8-4369-A92F-A4F8A82EDDD7" targetRef="sid-7C072C86-5A44-4054-833B-F7B39838C118"></sequenceFlow> + </process> + <bpmndi:BPMNDiagram id="BPMNDiagram_unsubscribeInterest"> + <bpmndi:BPMNPlane bpmnElement="unsubscribeInterest" id="BPMNPlane_unsubscribeInterest"> + <bpmndi:BPMNShape bpmnElement="startEvent1" id="BPMNShape_startEvent1"> + <omgdc:Bounds height="30.0" width="30.0" x="100.0" y="163.0"></omgdc:Bounds> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="sid-82168C15-ACC8-4369-A92F-A4F8A82EDDD7" id="BPMNShape_sid-82168C15-ACC8-4369-A92F-A4F8A82EDDD7"> + <omgdc:Bounds height="80.0" width="100.0" x="175.0" y="138.0"></omgdc:Bounds> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="sid-7C072C86-5A44-4054-833B-F7B39838C118" id="BPMNShape_sid-7C072C86-5A44-4054-833B-F7B39838C118"> + <omgdc:Bounds height="28.0" width="28.0" x="332.5" y="164.0"></omgdc:Bounds> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge bpmnElement="sid-7C8AD2EA-BD4C-4251-B369-DC80DA765953" id="BPMNEdge_sid-7C8AD2EA-BD4C-4251-B369-DC80DA765953"> + <omgdi:waypoint x="129.9499984899576" y="178.0"></omgdi:waypoint> + <omgdi:waypoint x="174.9999999999917" y="178.0"></omgdi:waypoint> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="sid-692F5534-B5CD-45AA-84DE-4BD5B0AC18BD" id="BPMNEdge_sid-692F5534-B5CD-45AA-84DE-4BD5B0AC18BD"> + <omgdi:waypoint x="274.94999999998043" y="178.0"></omgdi:waypoint> + <omgdi:waypoint x="332.5" y="178.0"></omgdi:waypoint> + </bpmndi:BPMNEdge> + </bpmndi:BPMNPlane> + </bpmndi:BPMNDiagram> +</definitions> \ No newline at end of file diff --git a/.liquibase/Data_alias/basic/workflows/changelog.xml b/.liquibase/Data_alias/basic/workflows/changelog.xml index d8435c8e0a5a930b4e483a48abe1af658f34ba3b..e1aef03f97be040168ce8e1bc271239e4843b494 100644 --- a/.liquibase/Data_alias/basic/workflows/changelog.xml +++ b/.liquibase/Data_alias/basic/workflows/changelog.xml @@ -3,4 +3,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> <include relativeToChangelogFile="true" file="insert_rejectEmailCommunication.xml"/> + <include relativeToChangelogFile="true" file="insert_unsubscribeInterest.xml"/> </databaseChangeLog> \ No newline at end of file diff --git a/.liquibase/Data_alias/basic/workflows/insert_rejectEmailCommunication.xml b/.liquibase/Data_alias/basic/workflows/insert_rejectEmailCommunication.xml index f36307a0da09884372146472a9b51528f4101a3d..792553fc3d08ec14befc3f38dae31671fd0825d2 100644 --- a/.liquibase/Data_alias/basic/workflows/insert_rejectEmailCommunication.xml +++ b/.liquibase/Data_alias/basic/workflows/insert_rejectEmailCommunication.xml @@ -5,7 +5,7 @@ <changeSet author="s.listl" id="e9e5f42b-5df9-430b-aaad-52ded69db85d"> <insert tableName="STANDARD_WORKFLOW"> <column name="STANDARD_WORKFLOWID" value="59d620ab-6dfc-4da7-b0ad-226fa78949e4"/> - <column name="KEY" value="rejectEmailCommunication"/> + <column name="PROCESSKEY" value="rejectEmailCommunication"/> <column name="NAME" value="Reject email communication"/> <column name="DESCRIPTION" value="Sets a communication setting to reject emails"/> <column name="PROCESSXML" valueBlobFile="blob/rejectEmailCommunication.xml"/> diff --git a/.liquibase/Data_alias/basic/workflows/insert_unsubscribeInterest.xml b/.liquibase/Data_alias/basic/workflows/insert_unsubscribeInterest.xml new file mode 100644 index 0000000000000000000000000000000000000000..4d90b4695239d75cb26cdc9792aae20dd43a13ee --- /dev/null +++ b/.liquibase/Data_alias/basic/workflows/insert_unsubscribeInterest.xml @@ -0,0 +1,15 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> + <changeSet author="s.listl" id="608978ed-2471-4c46-85cf-eeab044025b1"> + <insert tableName="STANDARD_WORKFLOW"> + <column name="STANDARD_WORKFLOWID" value="b14f9d59-b896-433c-a515-c6f209924efd"/> + <column name="PROCESSKEY" value="unsubscribeInterest"/> + <column name="NAME" value="Unsubscribe Interest"/> + <column name="DESCRIPTION" value="Sets an interest link with the status 'unsubscribed'"/> + <column name="PROCESSXML" valueBlobFile="blob/unsubscribeInterest.xml"/> + <column name="DIAGRAM" valueBlobFile="blob/unsubscribeInterest.png"/> + </insert> + </changeSet> +</databaseChangeLog> \ No newline at end of file diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml index c857106827be227c327378abc66645907d7c6338..a42f84d68b282255a70a079919131e192b8b1a11 100644 --- a/.liquibase/Data_alias/changelog.xml +++ b/.liquibase/Data_alias/changelog.xml @@ -20,10 +20,6 @@ <include relativeToChangelogFile="true" file="basic/2020.2.2/changelog.xml"/> <include relativeToChangelogFile="true" file="basic/2020.2.3/changelog.xml"/> <include relativeToChangelogFile="true" file="basic/2021.0.0/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.0.1/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.0.2/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.0.3/changelog.xml"/> - <include relativeToChangelogFile="true" file="basic/2021.1.0/changelog.xml"/> <include relativeToChangelogFile="true" file="basic/workflows/changelog.xml" context="workflow"/> <!--enable this only when you definetly want to overwrite the existing data with demo records:--> diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod index b32ed04cf46fd53a43f0bdd72acdf1c67b9e2731..4c291546c548cf5bf6bab7f588bb148e1d9bbbe9 100644 --- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod +++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod @@ -122,8 +122,6 @@ <name>AnyContacts</name> <dependency> <name>dependency</name> - <entityName>AnyContact_entity</entityName> - <fieldName>ContactsByIds</fieldName> </dependency> <children> <entityParameter> diff --git a/entity/StandardWorkflow_entity/StandardWorkflow_entity.aod b/entity/StandardWorkflow_entity/StandardWorkflow_entity.aod index be65ad093d97c10a2f64271cbe075c188785cf28..d83e0534b8952944bbe86b276c8af247a963d8e6 100644 --- a/entity/StandardWorkflow_entity/StandardWorkflow_entity.aod +++ b/entity/StandardWorkflow_entity/StandardWorkflow_entity.aod @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21"> <name>StandardWorkflow_entity</name> <title>Standard workflow</title> <majorModelMode>DISTRIBUTED</majorModelMode> + <documentation>%aditoprj%/entity/StandardWorkflow_entity/documentation.adoc</documentation> <grantCreate v="false" /> <grantUpdate v="false" /> <grantDelete v="false" /> @@ -11,14 +12,6 @@ <entityFields> <entityProvider> <name>#PROVIDER</name> - <dependencies> - <entityDependency> - <name>38e423c3-f0b2-48d6-a035-5b19c79591ac</name> - <entityName>WorkflowDefinitionStore_entity</entityName> - <fieldName>StandardWorkflows</fieldName> - <isConsumer v="false" /> - </entityDependency> - </dependencies> </entityProvider> <entityProvider> <name>#PROVIDER_AGGREGATES</name> diff --git a/entity/StandardWorkflow_entity/documentation.adoc b/entity/StandardWorkflow_entity/documentation.adoc new file mode 100644 index 0000000000000000000000000000000000000000..82672b0e0b08393b5453fb619d5a242e27a2a1aa --- /dev/null +++ b/entity/StandardWorkflow_entity/documentation.adoc @@ -0,0 +1,3 @@ += StandardWorkflow_entity + +Standard workflows are stored in the table STANDARD_WORKFLOW. The table is filled exclusively by liquibase scripts, this entity is read-only. diff --git a/entity/WorkflowDefinitionStore_entity/WorkflowDefinitionStore_entity.aod b/entity/WorkflowDefinitionStore_entity/WorkflowDefinitionStore_entity.aod index 21a60f403d67154cb83035a0b7043c22a3801502..c5b314b15944ca13faa9f35b0ff3495c3c7438ca 100644 --- a/entity/WorkflowDefinitionStore_entity/WorkflowDefinitionStore_entity.aod +++ b/entity/WorkflowDefinitionStore_entity/WorkflowDefinitionStore_entity.aod @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21"> <name>WorkflowDefinitionStore_entity</name> <title>Workflow definitions</title> <majorModelMode>DISTRIBUTED</majorModelMode> + <documentation>%aditoprj%/entity/WorkflowDefinitionStore_entity/documentation.adoc</documentation> <recordContainer>dataless</recordContainer> <entityFields> <entityProvider> @@ -32,7 +33,7 @@ </entityConsumer> <entityActionField> <name>deploySelectedWorkflow</name> - <title>Add selected</title> + <title>Add selected workflow</title> <onActionProcess>%aditoprj%/entity/WorkflowDefinitionStore_entity/entityfields/deployselectedworkflow/onActionProcess.js</onActionProcess> <iconId>VAADIN:PLUS</iconId> <stateProcess>%aditoprj%/entity/WorkflowDefinitionStore_entity/entityfields/deployselectedworkflow/stateProcess.js</stateProcess> @@ -49,6 +50,13 @@ <contentType>BOOLEAN</contentType> <state>EDITABLE</state> </entityField> + <entityActionField> + <name>downloadSelectedWorkflow</name> + <title>Download selected workflow</title> + <onActionProcess>%aditoprj%/entity/WorkflowDefinitionStore_entity/entityfields/downloadselectedworkflow/onActionProcess.js</onActionProcess> + <iconId>VAADIN:DOWNLOAD</iconId> + <stateProcess>%aditoprj%/entity/WorkflowDefinitionStore_entity/entityfields/downloadselectedworkflow/stateProcess.js</stateProcess> + </entityActionField> </entityFields> <recordContainers> <datalessRecordContainer> diff --git a/entity/WorkflowDefinitionStore_entity/documentation.adoc b/entity/WorkflowDefinitionStore_entity/documentation.adoc new file mode 100644 index 0000000000000000000000000000000000000000..608df1a5bed24a00633b573fdb23c5fcc9edc960 --- /dev/null +++ b/entity/WorkflowDefinitionStore_entity/documentation.adoc @@ -0,0 +1,9 @@ += WorkflowDefinitionStore_entity + +The purpose of this entity is to display all the standard workflow definitions that can be imported into the system. It provides an overlay +where the workflows can be selected and deployed with the actions of this entity. + +Standard workflows are handled this way because the workflow engine is running inside its own service with an own database. That's why these workflows +cannot be inserted directly with liquibase. Instead, the standard workflows are stored in a database table on the ADITO side, and can be transferred +to the workflow service using this entity. An additional advantage of this solution is better flexibility, as it makes using the standard workflows +optional, the admin can choose in the client what workflow definitions to deploy. \ No newline at end of file diff --git a/entity/WorkflowDefinitionStore_entity/entityfields/downloadselectedworkflow/onActionProcess.js b/entity/WorkflowDefinitionStore_entity/entityfields/downloadselectedworkflow/onActionProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..94d54bfc7c37cf8dba90c930ab85a7585aae19df --- /dev/null +++ b/entity/WorkflowDefinitionStore_entity/entityfields/downloadselectedworkflow/onActionProcess.js @@ -0,0 +1,13 @@ +import("system.neon"); +import("system.util"); +import("system.workflow"); +import("Sql_lib"); +import("system.vars"); + +var workflowId = vars.get("$field.selectedWorkflows"); +var [name, processXml] = newSelect(["NAME", "PROCESSXML"]) + .from("STANDARD_WORKFLOW") + .where("STANDARD_WORKFLOW.STANDARD_WORKFLOWID", workflowId) + .arrayRow(); + +neon.download(processXml, name + ".xml"); \ No newline at end of file diff --git a/entity/WorkflowDefinitionStore_entity/entityfields/downloadselectedworkflow/stateProcess.js b/entity/WorkflowDefinitionStore_entity/entityfields/downloadselectedworkflow/stateProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..a0cbee140b30c3f499f7b5d86f1dbcbfcc4172e4 --- /dev/null +++ b/entity/WorkflowDefinitionStore_entity/entityfields/downloadselectedworkflow/stateProcess.js @@ -0,0 +1,10 @@ +import("system.result"); +import("system.vars"); +import("system.neon"); + +var state = neon.COMPONENTSTATE_DISABLED; +if (vars.get("$field.selectedWorkflows")) +{ + state = neon.COMPONENTSTATE_EDITABLE; +} +result.string(state); \ No newline at end of file diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index b94ce935a384816581e7aa2ff6347e019fd97d2b..83e6860df33fc3c37eacb6fc9b857c909b5ae4fe 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -8632,6 +8632,63 @@ <entry> <key>Global Cases </key> </entry> + <entry> + <key>Attributes of attribute group \"%0\" have to be used at least %1.</key> + </entry> + <entry> + <key>Attributes of attribute group \"%0\" can't be used more than %1.</key> + </entry> + <entry> + <key>Add selected workflow</key> + </entry> + <entry> + <key>Profiling</key> + </entry> + <entry> + <key>Add all</key> + </entry> + <entry> + <key>Standard workflow</key> + </entry> + <entry> + <key>Standard workflows</key> + </entry> + <entry> + <key>Global</key> + </entry> + <entry> + <key>Bounce (Soft)</key> + </entry> + <entry> + <key>Test1</key> + </entry> + <entry> + <key>Bounce (Hard)</key> + </entry> + <entry> + <key>Smart TV</key> + </entry> + <entry> + <key>Desktop</key> + </entry> + <entry> + <key>Download selected workflow</key> + </entry> + <entry> + <key>Send workflow signal</key> + </entry> + <entry> + <key>Tablet</key> + </entry> + <entry> + <key>Blacklist</key> + </entry> + <entry> + <key>SubTest1</key> + </entry> + <entry> + <key>Exclude existing workflows</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> <sqlModels> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 3226194b7c748c60ff7b268cef748a56d8abdf4e..b53cdc8b99d0ff66bfe27910dce5fe4346dea4ad 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -11347,6 +11347,63 @@ Bitte Datumseingabe prüfen</value> <entry> <key>Global Cases </key> </entry> + <entry> + <key>Add selected workflow</key> + <value>Ausgewählten Workflow hinzufügen</value> + </entry> + <entry> + <key>Profiling</key> + </entry> + <entry> + <key>Add all</key> + <value>Alle hinzufügen</value> + </entry> + <entry> + <key>Standard workflow</key> + <value>Standard Workflow</value> + </entry> + <entry> + <key>Standard workflows</key> + <value>Standard Workflows</value> + </entry> + <entry> + <key>Global</key> + </entry> + <entry> + <key>Bounce (Soft)</key> + </entry> + <entry> + <key>Test1</key> + </entry> + <entry> + <key>Bounce (Hard)</key> + </entry> + <entry> + <key>Smart TV</key> + </entry> + <entry> + <key>Desktop</key> + </entry> + <entry> + <key>Download selected workflow</key> + <value>Ausgewählten Workflow herunterladen</value> + </entry> + <entry> + <key>Send workflow signal</key> + </entry> + <entry> + <key>Tablet</key> + </entry> + <entry> + <key>Blacklist</key> + </entry> + <entry> + <key>SubTest1</key> + </entry> + <entry> + <key>Exclude existing workflows</key> + <value>Nur nicht vorhandene Workflows</value> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 1464a7d2e294dcbe1771ba44c0e878a2cc23415f..3cb99dc83ef73a8a6e7cf68a36f90142779ed29c 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -8717,6 +8717,63 @@ <entry> <key>Global Cases </key> </entry> + <entry> + <key>Attributes of attribute group \"%0\" have to be used at least %1.</key> + </entry> + <entry> + <key>Attributes of attribute group \"%0\" can't be used more than %1.</key> + </entry> + <entry> + <key>Add selected workflow</key> + </entry> + <entry> + <key>Profiling</key> + </entry> + <entry> + <key>Add all</key> + </entry> + <entry> + <key>Standard workflow</key> + </entry> + <entry> + <key>Standard workflows</key> + </entry> + <entry> + <key>Global</key> + </entry> + <entry> + <key>Bounce (Soft)</key> + </entry> + <entry> + <key>Test1</key> + </entry> + <entry> + <key>Bounce (Hard)</key> + </entry> + <entry> + <key>Smart TV</key> + </entry> + <entry> + <key>Desktop</key> + </entry> + <entry> + <key>Download selected workflow</key> + </entry> + <entry> + <key>Send workflow signal</key> + </entry> + <entry> + <key>Tablet</key> + </entry> + <entry> + <key>Blacklist</key> + </entry> + <entry> + <key>SubTest1</key> + </entry> + <entry> + <key>Exclude existing workflows</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/neonView/WorkflowDefinitionStore_view/WorkflowDefinitionStore_view.aod b/neonView/WorkflowDefinitionStore_view/WorkflowDefinitionStore_view.aod index 1b580e907429e5f681bbf06da99f663097b8d02b..6e10496aa1c6398931a86e0e06489a88f6776e8a 100644 --- a/neonView/WorkflowDefinitionStore_view/WorkflowDefinitionStore_view.aod +++ b/neonView/WorkflowDefinitionStore_view/WorkflowDefinitionStore_view.aod @@ -21,6 +21,7 @@ <name>Actions</name> <actions> <element>deploySelectedWorkflow</element> + <element>downloadSelectedWorkflow</element> <element>deployAllWorkflows</element> </actions> </actionsViewTemplate> diff --git a/process/SetInterestLink_workflowService/process.js b/process/SetInterestLink_workflowService/process.js index 5a6447a1a3ecfafc87bf0ab271a52683c138bf81..b66a48e570ae73bc4fc57e2bd4a01744826ad76f 100644 --- a/process/SetInterestLink_workflowService/process.js +++ b/process/SetInterestLink_workflowService/process.js @@ -6,6 +6,14 @@ import("Sql_lib"); var variables = JSON.parse(vars.get("$local.value")); var contactId = variables.contactId || variables.targetId; var interestId = variables.interestId; +if (!interestId && variables.mailLogId) +{ + interestId = newSelect("MAIL_RUN.INTERESTID") + .from("MAIL_LOG") + .join("MAIL_RUN", "MAIL_LOG.MAIL_RUN_ID = MAIL_RUN.MAIL_RUNID") + .where("MAIL_LOG.MAIL_LOGID", variables.mailLogId) + .cell(); +} var status = variables.status || $KeywordRegistry.interestLinkStatus$notSubscribed(); var interestLinkId = new SqlBuilder()