Merge origin/refactor_entity into refactor_entity

71401e18 · Johannes Hörmann · 5906fed3 · ac511481 · 71401e18 · 71401e18
Commit 71401e18 authored 6 years ago by Johannes Hörmann
--- a/entity/Org_entity/entityfields/comms/children/relid_param/code.js
+++ b/entity/Org_entity/entityfields/comms/children/relid_param/code.js
--- a/entity/Org_entity/entityfields/emailcomms/children/relid_param/code.js
+++ b/entity/Org_entity/entityfields/emailcomms/children/relid_param/code.js
--- a/entity/Org_entity/entityfields/emailcomms/children/commcategory_param/code.js
+++ b/entity/Org_entity/entityfields/emailcomms/children/commcategory_param/code.js
--- a/entity/Org_entity/entityfields/orgaddresses/children/relid_param/code.js
+++ b/entity/Org_entity/entityfields/orgaddresses/children/relid_param/code.js
--- a/entity/Org_entity/entityfields/phonecomms/children/commcategory_param/code.js
+++ b/entity/Org_entity/entityfields/phonecomms/children/commcategory_param/code.js
--- a/entity/Org_entity/entityfields/phonecomms/children/relid_param/code.js
+++ b/entity/Org_entity/entityfields/phonecomms/children/relid_param/code.js
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -21,12 +21,12 @@
    </neonViewReference>
    <neonViewReference>
      <name>7bab8dbf-b69e-412d-a604-3a6999658e10</name>
-      <entityField>ActivityDocument_dfo</entityField>
+      <entityField>AllDocuments</entityField>
      <view>DocumentFilter_view</view>
    </neonViewReference>
    <neonViewReference>
      <name>6066d539-d392-4688-931a-409c10fa1fbe</name>
-      <entityField>ActivityLink_dfo</entityField>
+      <entityField>Links</entityField>
      <view>ActivityLinkFilter_view</view>
    </neonViewReference>
  </children>

--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -36,7 +36,7 @@
    </genericViewTemplate>
    <neonViewReference>
      <name>43167618-e4dc-429b-a264-3ea95bd647f9</name>
-      <entityField>ActivityMainDocument_dfo</entityField>
+      <entityField>MainDocuments</entityField>
      <view>DocumentList_view</view>
    </neonViewReference>
  </children>

--- a/neonView/OrgEdit_view/OrgEdit_view.aod
+++ b/neonView/OrgEdit_view/OrgEdit_view.aod
@@ -44,12 +44,12 @@
    </genericViewTemplate>
    <neonViewReference>
      <name>148e3a6c-d30b-470c-84e5-273293348611</name>
-      <entityField>OrgAddresses</entityField>
+      <entityField>Addresses</entityField>
      <view>AdressMultiEdit_view</view>
    </neonViewReference>
    <neonViewReference>
      <name>6355808f-ee94-4caf-95b1-3848e81c75b7</name>
-      <entityField>Comms</entityField>
+      <entityField>Communications</entityField>
      <view>CommMultiEdit_view</view>
    </neonViewReference>
    <neonViewReference>

--- a/neonView/OrgPreview_view/OrgPreview_view.aod
+++ b/neonView/OrgPreview_view/OrgPreview_view.aod
@@ -17,12 +17,12 @@
    </cardViewTemplate>
    <neonViewReference>
      <name>2cb11b4e-dd8e-419b-8fff-ef0852ef2641</name>
-      <entityField>Comms</entityField>
+      <entityField>Communications</entityField>
      <view>CommList_view</view>
    </neonViewReference>
    <neonViewReference>
      <name>df605bb6-5d18-4233-abc0-1da82e4910ca</name>
-      <entityField>OrgAddresses</entityField>
+      <entityField>Addresses</entityField>
      <view>AddressList_view</view>
    </neonViewReference>
    <genericViewTemplate>