From 0295121ad0b15e3b6ae5f7d36bd27c41edd3e5c9 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Thu, 28 Jan 2021 11:02:17 +0100
Subject: [PATCH] 1072418 Document_entity upload mandatory
---
entity/Document_entity/Document_entity.aod | 4 ++--
.../Document_entity/contentDescriptionProcess.js | 4 ++++
.../entityfields/bindata_upload/onValidation.js | 10 ++++++++++
.../entityfields/bindata_upload/onValueChange.js | 2 +-
entity/Document_entity/onValidation.js | 14 --------------
5 files changed, 17 insertions(+), 17 deletions(-)
create mode 100644 entity/Document_entity/contentDescriptionProcess.js
create mode 100644 entity/Document_entity/entityfields/bindata_upload/onValidation.js
delete mode 100644 entity/Document_entity/onValidation.js
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 5b20303df25..59b59b7355c 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -5,8 +5,8 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Document_entity/documentation.adoc</documentation>
<grantCreateProcess>%aditoprj%/entity/Document_entity/grantCreateProcess.js</grantCreateProcess>
- <onValidation>%aditoprj%/entity/Document_entity/onValidation.js</onValidation>
<contentTitleProcess>%aditoprj%/entity/Document_entity/contentTitleProcess.js</contentTitleProcess>
+ <contentDescriptionProcess>%aditoprj%/entity/Document_entity/contentDescriptionProcess.js</contentDescriptionProcess>
<iconId>VAADIN:FILE</iconId>
<titlePlural>Documents</titlePlural>
<recordContainer>jdito</recordContainer>
@@ -59,7 +59,6 @@
<name>BINDATA_UPLOAD</name>
<title>File</title>
<contentType>FILE</contentType>
- <mandatory v="false" />
<mandatoryProcess>%aditoprj%/entity/Document_entity/entityfields/bindata_upload/mandatoryProcess.js</mandatoryProcess>
<onValueChange>%aditoprj%/entity/Document_entity/entityfields/bindata_upload/onValueChange.js</onValueChange>
<onValueChangeTypes>
@@ -67,6 +66,7 @@
<element>PROCESS</element>
<element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
+ <onValidation>%aditoprj%/entity/Document_entity/entityfields/bindata_upload/onValidation.js</onValidation>
</entityField>
<entityActionGroup>
<name>Document_actions</name>
diff --git a/entity/Document_entity/contentDescriptionProcess.js b/entity/Document_entity/contentDescriptionProcess.js
new file mode 100644
index 00000000000..06a46eb6389
--- /dev/null
+++ b/entity/Document_entity/contentDescriptionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.DESCRIPTION"));
\ No newline at end of file
diff --git a/entity/Document_entity/entityfields/bindata_upload/onValidation.js b/entity/Document_entity/entityfields/bindata_upload/onValidation.js
new file mode 100644
index 00000000000..dae974a4822
--- /dev/null
+++ b/entity/Document_entity/entityfields/bindata_upload/onValidation.js
@@ -0,0 +1,10 @@
+import("system.translate");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ if (!vars.get("$local.value"))
+ result.string(translate.text("No file selected."));
+}
\ No newline at end of file
diff --git a/entity/Document_entity/entityfields/bindata_upload/onValueChange.js b/entity/Document_entity/entityfields/bindata_upload/onValueChange.js
index c0b7a0db070..39737df167e 100644
--- a/entity/Document_entity/entityfields/bindata_upload/onValueChange.js
+++ b/entity/Document_entity/entityfields/bindata_upload/onValueChange.js
@@ -3,5 +3,5 @@ import("system.neon");
import("Entity_lib");
import("Document_lib");
-var uploadValue = vars.get("local.value");
+var uploadValue = vars.get("$local.value");
neon.setFieldValue("$field.NAME", DocumentUtil.getFilenameFromUpload(uploadValue));
diff --git a/entity/Document_entity/onValidation.js b/entity/Document_entity/onValidation.js
deleted file mode 100644
index 0b72eeb36e8..00000000000
--- a/entity/Document_entity/onValidation.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("system.translate");
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- var bindata = vars.get("$field.BINDATA_UPLOAD");
-
- if(bindata == null || bindata == "")
- {
- result.string(translate.text("No file selected."));
- }
-}
\ No newline at end of file
--
GitLab