Skip to content
Snippets Groups Projects
Commit c13c6a64 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

use same Picture-loading mechanisms for anycontact as for Person / Organisation

parent 9ada09ae
No related branches found
No related tags found
No related merge requests found
......@@ -111,9 +111,9 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<title>Lastname</title>
</entityField>
<entityField>
<name>IMAGE</name>
<name>PERSON_PICTURE</name>
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/image/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_picture/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>STANDARD_EMAIL_COMMUNICATION</name>
......@@ -165,6 +165,10 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/withprivatepersons_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>AvatarText_param</name>
<valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/avatartext_param/valueProcess.js</valueProcess>
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -260,6 +264,10 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<name>PERSON_SALUTATION.value</name>
<recordfield>PERSON.SALUTATION</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_PICTURE.value</name>
<recordfield>PERSON.PICTURE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
import("system.logging");
import("system.vars");
import("system.result");
switch (vars.get("$field.contactType"))
{
case "1":
result.string("TEXT:" + vars.getString("$field.ORGANISATION_NAME"));
break;
case "2":
case "3":
result.string("TEXT:" + (vars.getString("$field.PERSON_FIRSTNAME") + " " + vars.getString("$field.PERSON_LASTNAME") + " " + vars.getString("$field.ORGANISATION_NAME")).trim());
break;
default:
result.string("");
}
import("system.result");
import("system.neon");
import("system.vars");
import("Person_lib");
import("Organisation_lib");
import("Contact_lib");
if (vars.get("$field.contactType") == 1) // 1 == org, 2 == person, 3 == person
{
result.string(OrgUtils.getImage(vars.get("$field.ORGANISATION_ID"), vars.getString("$field.ORGANISATION_NAME")));
}
else
{
result.string(PersUtils.getImage(vars.get("$field.PERSON_ID"), (vars.getString("$field.PERSON_FIRSTNAME") + " " + vars.getString("$field.PERSON_LASTNAME")).trim()));
}
\ No newline at end of file
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW) {
if (vars.get("$field.PERSON_PICTURE"))
result.string(vars.get("$field.PERSON_PICTURE"));
else
result.string(vars.get("$param.AvatarText_param"));
}
\ No newline at end of file
......@@ -14,7 +14,7 @@
<columns>
<neonTableColumn>
<name>5a0d38bb-bfa5-4abc-86e7-fac65804bb5c</name>
<entityField>IMAGE</entityField>
<entityField>PERSON_PICTURE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>ca59a64a-adce-49c3-93ad-2978c81809f8</name>
......
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