From 554df3c97562c3ddf0fe46741b01cf661c37da5f Mon Sep 17 00:00:00 2001
From: mescher <m.escher@adito.de>
Date: Thu, 12 Sep 2019 13:42:47 +0200
Subject: [PATCH] #1039931 fix Image/Picture refresh
---
entity/BulkMail_entity/BulkMail_entity.aod | 1 +
entity/Contract_entity/Contract_entity.aod | 1 +
entity/Offer_entity/Offer_entity.aod | 1 +
entity/Order_entity/Order_entity.aod | 1 +
.../entityfields/picture/displayValueProcess.js | 8 ++++++--
entity/Productprice_entity/Productprice_entity.aod | 1 +
entity/Salesproject_entity/Salesproject_entity.aod | 1 +
entity/SerialLetter_entity/SerialLetter_entity.aod | 1 +
entity/SupportTicket_entity/SupportTicket_entity.aod | 1 +
9 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index 6f02e58b00..98cee0660b 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -95,6 +95,7 @@
<entityField>
<name>ICON</name>
<contentType>IMAGE</contentType>
+ <state>READONLY</state>
<valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 52283a9db6..a3f94750a8 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -124,6 +124,7 @@
<entityField>
<name>IMAGE</name>
<contentType>IMAGE</contentType>
+ <state>READONLY</state>
<valueProcess>%aditoprj%/entity/Contract_entity/entityfields/image/valueProcess.js</valueProcess>
</entityField>
<entityFieldGroup>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index a567633b71..3963a8727f 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -81,6 +81,7 @@
<entityField>
<name>IMAGE</name>
<contentType>IMAGE</contentType>
+ <state>READONLY</state>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/image/valueProcess.js</valueProcess>
</entityField>
<entityField>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 0f222669ca..8d267bc62b 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -76,6 +76,7 @@
<entityField>
<name>IMAGE</name>
<contentType>IMAGE</contentType>
+ <state>READONLY</state>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/image/valueProcess.js</valueProcess>
</entityField>
<entityField>
diff --git a/entity/Organisation_entity/entityfields/picture/displayValueProcess.js b/entity/Organisation_entity/entityfields/picture/displayValueProcess.js
index a8bad702a8..2ad6742677 100644
--- a/entity/Organisation_entity/entityfields/picture/displayValueProcess.js
+++ b/entity/Organisation_entity/entityfields/picture/displayValueProcess.js
@@ -2,5 +2,9 @@ import("system.vars");
import("system.result");
import("system.neon");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && !vars.get("$this.value"))
- result.string(vars.get("$param.AvatarText_param"));
\ No newline at end of file
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW) {
+ if (vars.get("$field.PICTURE"))
+ result.string(vars.get("$field.PICTURE"));
+ else
+ result.string(vars.get("$param.AvatarText_param"));
+}
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index f7678ec46b..9321eb0805 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -129,6 +129,7 @@
<entityField>
<name>IMAGE</name>
<contentType>IMAGE</contentType>
+ <state>READONLY</state>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/image/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index dc45ece712..1f92dd13f7 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -295,6 +295,7 @@
<entityField>
<name>IMAGE</name>
<contentType>IMAGE</contentType>
+ <state>READONLY</state>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/image/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod
index a9ce78e8e8..43586c78cb 100644
--- a/entity/SerialLetter_entity/SerialLetter_entity.aod
+++ b/entity/SerialLetter_entity/SerialLetter_entity.aod
@@ -45,6 +45,7 @@
<entityField>
<name>ICON</name>
<contentType>IMAGE</contentType>
+ <state>READONLY</state>
<valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 55bb20dcf1..53a96c1192 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -100,6 +100,7 @@
<name>TASK_PRIORITY_ICON</name>
<colorProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js</colorProcess>
<contentType>IMAGE</contentType>
+ <state>READONLY</state>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_priority_icon/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
--
GitLab