diff --git a/entity/Attribute_entity/afterUiInit.js b/entity/Attribute_entity/afterUiInit.js index fa558b3520b5d3239c1b8f299d30cc1a40458411..70936b24c9587c4a54617842edf91e1a9871369e 100644 --- a/entity/Attribute_entity/afterUiInit.js +++ b/entity/Attribute_entity/afterUiInit.js @@ -15,8 +15,8 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW var usages = newSelect("OBJECT_TYPE") .from("AB_ATTRIBUTEUSAGE") - .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", parentId) - .array(db.COLUMN, true) + .where("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", parentId) + .arrayColumn(true) //preset the usages with the ones from the parent usages.forEach(function (usage) diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod index d6929b901ce3532040174d49b581f9d828d4aafe..a967c20f616cda692961673640b24527c3eefe9c 100644 --- a/entity/BulkMail_entity/BulkMail_entity.aod +++ b/entity/BulkMail_entity/BulkMail_entity.aod @@ -7,6 +7,7 @@ <title>Bulk mail</title> <grantUpdateProcess>%aditoprj%/entity/BulkMail_entity/grantUpdateProcess.js</grantUpdateProcess> <contentTitleProcess>%aditoprj%/entity/BulkMail_entity/contentTitleProcess.js</contentTitleProcess> + <afterUiInit>%aditoprj%/entity/BulkMail_entity/afterUiInit.js</afterUiInit> <iconId>VAADIN:AT</iconId> <titlePlural>Bulk mails</titlePlural> <recordContainer>db</recordContainer> @@ -16,7 +17,6 @@ </entityProvider> <entityField> <name>BULKMAILID</name> - <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmailid/valueProcess.js</valueProcess> </entityField> <entityField> <name>NAME</name> diff --git a/entity/BulkMail_entity/entityfields/bulkmailid/valueProcess.js b/entity/BulkMail_entity/afterUiInit.js similarity index 100% rename from entity/BulkMail_entity/entityfields/bulkmailid/valueProcess.js rename to entity/BulkMail_entity/afterUiInit.js