fix #1051912: 360° Degree did not show entries of person contacts

(cherry picked from commit 554832d2)

entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js

 import("system.vars");
 import("system.result");
 
-result.object(["Salesproject", "Offer", "Order", "Contract", "Campaign", "SupportTicket"]);
\ No newline at end of file
+//No campaign, since a campaign can only be linked with a person. 
+//Even when all entries of persons are displayed in the organisation_entity: It's still nonsense to display campaigns per status.
+result.object(["Salesproject", "Offer", "Order", "Contract", "SupportTicket"]);
\ No newline at end of file

entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js

@@ -2,10 +2,9 @@ import("Sql_lib");
 import("system.vars");
 import("system.result");
 
-var person_contactids = newSelect( "CONTACTID" )
-                     .from("CONTACT")
-                     .where("CONTACT.ORGANISATION_ID", vars.getString("$field.ORGANISATIONID"))
-                     .and("CONTACT.PERSON_ID is null")
-                     .arrayColumn();
+var contactids = newSelect( "CONTACTID" )
+        .from("CONTACT")
+        .where("CONTACT.ORGANISATION_ID", vars.getString("$field.ORGANISATIONID"))
+        .arrayColumn();
 
-result.string( JSON.stringify([vars.getString("$field.CONTACTID")].concat(person_contactids)) );
\ No newline at end of file
+result.string( JSON.stringify(contactids) );
\ No newline at end of file

neonView/360DegreeFilter_view/360DegreeFilter_view.aod

@@ -25,6 +25,7 @@
       <dateField>DATE</dateField>
       <titleField>TITLE</titleField>
       <descriptionField>ENTITY_NAME</descriptionField>
+      <iconIdField>ICON</iconIdField>
       <entityField>#ENTITY</entityField>
     </timelineViewTemplate>
   </children>