From 8ea352f350194472c0e3ed82503d5f1b17987fd9 Mon Sep 17 00:00:00 2001
From: Andre Loreth <a.loreth@adito.de>
Date: Thu, 26 Mar 2020 14:39:11 +0100
Subject: [PATCH] #1055089: Check PresentationMode before building the report
data
---
.../entityfields/offer_report_data/valueProcess.js | 10 +++++++---
.../entityfields/order_report_data/valueProcess.js | 10 +++++++---
.../entityfields/reminder_report_data/valueProcess.js | 10 +++++++---
.../organisation_report_data/valueProcess.js | 11 ++++++++---
4 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/entity/Offer_entity/entityfields/offer_report_data/valueProcess.js b/entity/Offer_entity/entityfields/offer_report_data/valueProcess.js
index 8f694f3baf..bb4322d2d2 100644
--- a/entity/Offer_entity/entityfields/offer_report_data/valueProcess.js
+++ b/entity/Offer_entity/entityfields/offer_report_data/valueProcess.js
@@ -1,9 +1,13 @@
+import("system.neon");
import("system.vars");
import("system.result");
import("Offer_lib");
-var reportData = OfferUtils.buildOfferReport(vars.get("$field.OFFERID"));
+var presentationMode = vars.get("$sys.presentationmode");
+if (presentationMode != neon.CONTEXT_PRESENTATIONMODE_EDIT) {
+ var reportData = OfferUtils.buildOfferReport(vars.get("$field.OFFERID"));
-if (reportData != null) {
- result.string(reportData[1]);
+ if (reportData != null) {
+ result.string(reportData[1]);
+ }
}
diff --git a/entity/Order_entity/entityfields/order_report_data/valueProcess.js b/entity/Order_entity/entityfields/order_report_data/valueProcess.js
index 7a8f7a4091..631ebcb4ff 100644
--- a/entity/Order_entity/entityfields/order_report_data/valueProcess.js
+++ b/entity/Order_entity/entityfields/order_report_data/valueProcess.js
@@ -1,9 +1,13 @@
+import("system.neon");
import("system.result");
import("system.vars");
import("Order_lib");
-var reportData = OrderUtils.buildOrderReport(vars.get("$field.SALESORDERID"));
+var presentationMode = vars.get("$sys.presentationmode");
+if (presentationMode != neon.CONTEXT_PRESENTATIONMODE_EDIT) {
+ var reportData = OrderUtils.buildOrderReport(vars.get("$field.SALESORDERID"));
-if(reportData != null) {
- result.string(reportData[1]);
+ if(reportData != null) {
+ result.string(reportData[1]);
+ }
}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js b/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js
index 35c5e637a9..6ec07527ac 100644
--- a/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js
+++ b/entity/Order_entity/entityfields/reminder_report_data/valueProcess.js
@@ -1,9 +1,13 @@
+import("system.neon");
import("system.result");
import("system.vars");
import("Order_lib");
-var reportData = OrderUtils.buildReminderReport(vars.get("$field.SALESORDERID"));
+var presentationMode = vars.get("$sys.presentationmode");
+if (presentationMode != neon.CONTEXT_PRESENTATIONMODE_EDIT) {
+ var reportData = OrderUtils.buildReminderReport(vars.get("$field.SALESORDERID"));
-if(reportData != null) {
- result.string(reportData[1]);
+ if(reportData != null) {
+ result.string(reportData[1]);
+ }
}
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js b/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js
index 9dafd51d0b..873ef5f798 100644
--- a/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js
@@ -1,9 +1,14 @@
+import("system.logging");
import("system.vars");
import("system.result");
+import("system.neon");
import("Organisation_lib");
-var reportData = OrgUtils.buildOrgReport(vars.get("$field.ORGANISATIONID"), vars.get("$field.CONTACTID"))
+var presentationMode = vars.get("$sys.presentationmode");
+if (presentationMode != neon.CONTEXT_PRESENTATIONMODE_EDIT) {
+ var reportData = OrgUtils.buildOrgReport(vars.get("$field.ORGANISATIONID"), vars.get("$field.CONTACTID"))
-if (reportData != null) {
- result.string(reportData[1]);
+ if (reportData != null) {
+ result.string(reportData[1]);
+ }
}
\ No newline at end of file
--
GitLab