From 645046c7fe773bb6a3851ef56aa6025039121f4a Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 4 Aug 2020 11:31:39 +0200
Subject: [PATCH] Workflow imageProcess bugfix
---
.../WorkflowStartConfig_entity/imageProcess.js | 2 +-
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 17 +----------------
.../WorkflowStartConfigFilter_view.aod | 18 ++----------------
3 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/entity/WorkflowStartConfig_entity/imageProcess.js b/entity/WorkflowStartConfig_entity/imageProcess.js
index 34147b89bd..8b918cbc28 100644
--- a/entity/WorkflowStartConfig_entity/imageProcess.js
+++ b/entity/WorkflowStartConfig_entity/imageProcess.js
@@ -2,5 +2,5 @@ import("system.result");
import("system.vars");
import("system.project");
-var contextModel = project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"));
+var contextModel = vars.get("$field.OBJECT_TYPE") && project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"));
result.string(contextModel ? contextModel[5] : "");
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 45bc63f8fe..a0f4cebe76 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -32,6 +32,7 @@
</entry>
<entry>
<key>Finished</key>
+ <value>Abgeschlossen</value>
</entry>
<entry>
<key>Show my organisations</key>
@@ -8739,15 +8740,12 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>leadimport notification</key>
- <value>Leadimport Benachrichtigung</value>
</entry>
<entry>
<key>bulk mail sent</key>
- <value>Serienmail versendet</value>
</entry>
<entry>
<key>download ready</key>
- <value>Download bereit</value>
</entry>
<entry>
<key>No new recipients found that can be added to the bulk mail.</key>
@@ -8757,19 +8755,10 @@ Bitte Datumseingabe prüfen</value>
<key>Permission received</key>
<value>erhaltene Berechtigung</value>
</entry>
- <entry>
- <key>leadimport notification</key>
- </entry>
<entry>
<key>granted permission</key>
<value>vergebene Berechtigung</value>
</entry>
- <entry>
- <key>bulk mail sent</key>
- </entry>
- <entry>
- <key>download ready</key>
- </entry>
<entry>
<key>Receive new Department Permission</key>
<value>Neue Abteilungs-Berechtigung erhalten</value>
@@ -8785,10 +8774,6 @@ Bitte Datumseingabe prüfen</value>
<key>No new recipients found that can be added to the serial letter.</key>
<value>Keine neuen Empfänger, die zum Serienbrief werden können, gefunden.</value>
</entry>
- <entry>
- <key>No new recipients found that can be added to the bulk mail.</key>
- <value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value>
- </entry>
<entry>
<key>export using the selected template</key>
<value>Mit der ausgewählten Vorlage Exportieren</value>
diff --git a/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod b/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
index 9c98d1fe51..cdac1faccf 100644
--- a/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
+++ b/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
@@ -3,9 +3,9 @@
<name>WorkflowStartConfigFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <groupLayout>
+ <boxLayout>
<name>layout</name>
- </groupLayout>
+ </boxLayout>
</layout>
<children>
<tableViewTemplate>
@@ -24,19 +24,5 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treeTableViewTemplate>
- <name>Treetable</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTreeTableColumn>
- <name>4874074f-80af-4e99-8449-2a4dc4428360</name>
- <entityField>OBJECT_TYPE</entityField>
- </neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>d479a082-ea95-40c6-81a2-9318fcf9ce98</name>
- <entityField>TRIGGER_EVENT</entityField>
- </neonTreeTableColumn>
- </columns>
- </treeTableViewTemplate>
</children>
</neonView>
--
GitLab