From a497c7e1d6d020deeb1642c623c614fd644c2884 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 3 Apr 2019 11:45:37 +0200
Subject: [PATCH] Angebot Neuanlage: Vertriebsproj. READONLY solange kein
Contact + condProc
---
.../salesproject_id/stateProcess.js | 30 +++++++++++--------
.../Salesproject_entity.aod | 1 +
.../recordcontainers/db/conditionProcess.js | 3 --
.../OfferitemFilter_view.aod | 4 ---
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js b/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
index a88395a1cc..1a1eb537b9 100644
--- a/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
+++ b/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
@@ -1,13 +1,19 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-
-switch (vars.get("$sys.recordstate"))
-{
- case neon.OPERATINGSTATE_NEW:
- result.object(neon.COMPONENTSTATE_EDITABLE);
- break;
- default:
- result.object(neon.COMPONENTSTATE_READONLY);
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Entity_lib");
+
+
+switch (vars.get("$sys.recordstate"))
+{
+ case neon.OPERATINGSTATE_NEW:
+ //only EDITABLE if $field.CONTACT_ID is set
+ if(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID")))
+ result.object(neon.COMPONENTSTATE_EDITABLE);
+ else
+ result.object(neon.COMPONENTSTATE_READONLY);
+ break;
+ default:
+ result.object(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 33b930ad5b..b1499464e8 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -70,6 +70,7 @@
<entityField>
<name>SALESPROJECTID</name>
<searchable v="false" />
+ <state>AUTO</state>
</entityField>
<entityField>
<name>STARTDATE</name>
diff --git a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
index a710bd959e..49d846ad22 100644
--- a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
@@ -4,9 +4,6 @@ import("system.result");
import("system.vars");
import("Sql_lib");
-logging.log("state: " + vars.get("$param.State_param"));
-logging.log("contact: " + vars.get("$param.ContactId_param"));
-
if(vars.exists("$param.State_param") && vars.get("$param.State_param") && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
{
result.string(db.translateCondition(
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index faeaabafb0..782aa68ca1 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -46,10 +46,6 @@
<name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
<entityField>OPTIONAL</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>a31fd16c-4237-4cd9-a9de-2267f186d342</name>
- <entityField>INFO</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>60a36c38-103f-4fdb-9e8a-b8fd6d441f14</name>
<entityField>TotalPrice</entityField>
--
GitLab