diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod index 4b9ca6452f75ecb7387dd32221a2f8793ba8d9c5..380476f5e8dd97eb310dae80556407832e8157f7 100644 --- a/entity/BulkMail_entity/BulkMail_entity.aod +++ b/entity/BulkMail_entity/BulkMail_entity.aod @@ -117,7 +117,6 @@ <entityField> <name>bindata</name> <contentType>FILE</contentType> - <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bindata/stateProcess.js</stateProcess> <onValueChange>%aditoprj%/entity/BulkMail_entity/entityfields/bindata/onValueChange.js</onValueChange> <onValueChangeTypes> <element>MASK</element> @@ -185,6 +184,7 @@ <title>Contact</title> <consumer>Contacts</consumer> <linkedContext>AnyContact</linkedContext> + <displayValueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/testing_contact_id/displayValueProcess.js</displayValueProcess> </entityField> <entityField> <name>TESTING_EMAIL_ADDRESS</name> diff --git a/entity/BulkMail_entity/entityfields/bindata/stateProcess.js b/entity/BulkMail_entity/entityfields/bindata/stateProcess.js deleted file mode 100644 index aeb23379eede28c20e47793bb4426f9ca2dfbd59..0000000000000000000000000000000000000000 --- a/entity/BulkMail_entity/entityfields/bindata/stateProcess.js +++ /dev/null @@ -1,8 +0,0 @@ -import("system.vars"); -import("system.result"); -import("system.neon"); - -var state = neon.COMPONENTSTATE_EDITABLE; -if (vars.get("$field.DOCUMENTTEMPLATE_ID")) - state = neon.COMPONENTSTATE_INVISIBLE; -result.string(state); \ No newline at end of file diff --git a/entity/BulkMail_entity/entityfields/name/valueProcess.js b/entity/BulkMail_entity/entityfields/name/valueProcess.js index 94a33c3fc3288465e8959ea57f74eb9b983d1787..829431cf9f199070dbd735ea9f6e391d49b59599 100644 --- a/entity/BulkMail_entity/entityfields/name/valueProcess.js +++ b/entity/BulkMail_entity/entityfields/name/valueProcess.js @@ -1,9 +1,10 @@ import("system.result"); import("Document_lib"); +import("system.entities"); import("system.neon"); import("system.vars"); -if (vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) +if (!vars.get("$this.value") && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) { var upload = vars.get("$field.bindata"); if (upload) @@ -11,4 +12,17 @@ if (vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPER var filename = DocumentUtil.getFilenameFromUpload(upload); result.string(filename.split(".")[0]); } + else + { + var conf = entities.createConfigForLoadingRows(); + conf.entity("DocumentTemplate_entity") + .fields(["NAME"]) + .uid(vars.get("$field.DOCUMENTTEMPLATE_ID")); + + var name = entities.getRows(conf); + if (name.length > 0) + name = name[0].NAME; + + result.string(name); + } } \ No newline at end of file diff --git a/entity/BulkMail_entity/entityfields/testing_contact_id/displayValueProcess.js b/entity/BulkMail_entity/entityfields/testing_contact_id/displayValueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..3cfd8a80f6d4914aa8636462e5fa8aaa63cb702e --- /dev/null +++ b/entity/BulkMail_entity/entityfields/testing_contact_id/displayValueProcess.js @@ -0,0 +1,5 @@ +import("system.vars"); +import("system.result"); +import("Contact_lib"); + +result.string(ContactUtils.getTitleByContactId(vars.get("$field.TESTING_CONTACT_ID"))); \ No newline at end of file