From 410af9d037abd1ae6ab8d228bfbc3c3f5c0ecd6c Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@ASCHINDLBECK.aditosoftware.local>
Date: Thu, 16 Jul 2020 14:39:25 +0200
Subject: [PATCH] #1060647 Favorites: viewtemplate change for Org, Pers
---
entity/Organisation_entity/Organisation_entity.aod | 4 ++--
.../{objecttype => organisation_objecttype}/valueProcess.js | 0
entity/Person_entity/Person_entity.aod | 4 ++--
.../{objecttype => person_objecttype}/valueProcess.js | 0
.../OrganisationPreview_view/OrganisationPreview_view.aod | 2 +-
neonView/PersonPreview_view/PersonPreview_view.aod | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
rename entity/Organisation_entity/entityfields/{objecttype => organisation_objecttype}/valueProcess.js (100%)
rename entity/Person_entity/entityfields/{objecttype => person_objecttype}/valueProcess.js (100%)
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 4cd0514b5c..414ff2eb81 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1103,8 +1103,8 @@
<iconId>NEON:TACKED</iconId>
</entityActionField>
<entityField>
- <name>OBJECTTYPE</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objecttype/valueProcess.js</valueProcess>
+ <name>ORGANISATION_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
diff --git a/entity/Organisation_entity/entityfields/objecttype/valueProcess.js b/entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/objecttype/valueProcess.js
rename to entity/Organisation_entity/entityfields/organisation_objecttype/valueProcess.js
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 6fd625f50d..828766d541 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1267,8 +1267,8 @@
</children>
</entityProvider>
<entityField>
- <name>OBJECTTYPE</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objecttype/valueProcess.js</valueProcess>
+ <name>PERSON_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/person_objecttype/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
diff --git a/entity/Person_entity/entityfields/objecttype/valueProcess.js b/entity/Person_entity/entityfields/person_objecttype/valueProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/objecttype/valueProcess.js
rename to entity/Person_entity/entityfields/person_objecttype/valueProcess.js
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index 63fb9474ae..eca1cae966 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -21,7 +21,7 @@
</cardViewTemplate>
<favoriteViewTemplate>
<name>Favorite</name>
- <objectType>OBJECTTYPE</objectType>
+ <objectType>ORGANISATION_OBJECTTYPE</objectType>
<rowId>#UID</rowId>
<entityField>#ENTITY</entityField>
<title>favorites</title>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index 17032aac82..f0f73a44de 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -21,7 +21,7 @@
</cardViewTemplate>
<favoriteViewTemplate>
<name>Favorites</name>
- <objectType>OBJECTTYPE</objectType>
+ <objectType>PERSON_OBJECTTYPE</objectType>
<rowId>#UID</rowId>
<entityField>#ENTITY</entityField>
<title>favorites</title>
--
GitLab