Skip to content
Snippets Groups Projects
Commit 554832d2 authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

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

parent 06a6934e
No related branches found
No related tags found
No related merge requests found
import("system.vars"); import("system.vars");
import("system.result"); import("system.result");
result.object(["Salesproject", "Offer", "Order", "Contract", "Campaign", "SupportTicket"]); //No campaign, since a campaign can only be linked with a person.
\ No newline at end of file //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
...@@ -2,10 +2,9 @@ import("Sql_lib"); ...@@ -2,10 +2,9 @@ import("Sql_lib");
import("system.vars"); import("system.vars");
import("system.result"); import("system.result");
var person_contactids = newSelect( "CONTACTID" ) var contactids = newSelect( "CONTACTID" )
.from("CONTACT") .from("CONTACT")
.where("CONTACT.ORGANISATION_ID", vars.getString("$field.ORGANISATIONID")) .where("CONTACT.ORGANISATION_ID", vars.getString("$field.ORGANISATIONID"))
.and("CONTACT.PERSON_ID is null") .arrayColumn();
.arrayColumn();
result.string( JSON.stringify([vars.getString("$field.CONTACTID")].concat(person_contactids)) ); result.string( JSON.stringify(contactids) );
\ No newline at end of file \ No newline at end of file
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
<dateField>DATE</dateField> <dateField>DATE</dateField>
<titleField>TITLE</titleField> <titleField>TITLE</titleField>
<descriptionField>ENTITY_NAME</descriptionField> <descriptionField>ENTITY_NAME</descriptionField>
<iconIdField>ICON</iconIdField>
<entityField>#ENTITY</entityField> <entityField>#ENTITY</entityField>
</timelineViewTemplate> </timelineViewTemplate>
</children> </children>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment