From 4fd205f02a5dbb794d06931ad37e65f3c23adbc1 Mon Sep 17 00:00:00 2001
From: Daniel Tran <d.tran@adito.de>
Date: Mon, 25 May 2020 10:54:15 +0200
Subject: [PATCH] #1052905: Added state process to disable action for inactive
contacts. #1052905: Changed #IMAGE field to PICTURE field, in view.
---
entity/Person_entity/Person_entity.aod | 12 +-----------
.../entityfields/newvisitplanentry/stateProcess.js | 7 +++++++
.../PersonSimpleList_view/PersonSimpleList_view.aod | 4 ++--
3 files changed, 10 insertions(+), 13 deletions(-)
create mode 100644 entity/Person_entity/entityfields/newvisitplanentry/stateProcess.js
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 4115bd0f2d..d8bfbd275a 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1153,17 +1153,6 @@
<entityName>Person_entity</entityName>
<fieldName>SelfDuplicatesProvider</fieldName>
</dependency>
- <children>
- <entityParameter>
- <name>OnlyShowContactIds_param</name>
- </entityParameter>
- <entityParameter>
- <name>DuplicateCurrentContactId_param</name>
- </entityParameter>
- <entityParameter>
- <name>DuplicateActionsControl_param</name>
- </entityParameter>
- </children>
</entityConsumer>
<entityProvider>
<name>SelfDuplicatesProvider</name>
@@ -1217,6 +1206,7 @@
<title>New Weekplanentry</title>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newvisitplanentry/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CAR</iconId>
+ <stateProcess>%aditoprj%/entity/Person_entity/entityfields/newvisitplanentry/stateProcess.js</stateProcess>
</entityActionField>
<entityProvider>
<name>IdFilteredActiveContacts</name>
diff --git a/entity/Person_entity/entityfields/newvisitplanentry/stateProcess.js b/entity/Person_entity/entityfields/newvisitplanentry/stateProcess.js
new file mode 100644
index 0000000000..aefbc6e8f7
--- /dev/null
+++ b/entity/Person_entity/entityfields/newvisitplanentry/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("KeywordRegistry_basic");
+
+if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
+ result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
diff --git a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
index 74abb3a7a1..5a2312e1f7 100644
--- a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
+++ b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
@@ -19,8 +19,8 @@
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>d6207ade-29e7-4af0-ba5f-e9ddd799de7b</name>
- <entityField>#IMAGE</entityField>
+ <name>cb441e57-dba4-49d6-a8f4-cea5db3187f2</name>
+ <entityField>PICTURE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>1053d3a7-c5ee-4260-86f6-54e820f53e9f</name>
--
GitLab