diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod index 092996034c1a7593a76ee2e45d5735dafd69b16f..15831ec86ebc03e1531bd37fc319aa582e0f4c4d 100644 --- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod +++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod @@ -135,10 +135,6 @@ <name>OBJECTTYPE.value</name> <recordfield>AB_APPOINTMENTLINK.OBJECT_TYPE</recordfield> </dbRecordFieldMapping> - <dbRecordFieldMapping> - <name>OBJECTID.displayValue</name> - <expression>%aditoprj%/entity/AppointmentLink_entity/recordcontainers/db/recordfieldmappings/objectid.displayvalue/expression.js</expression> - </dbRecordFieldMapping> <dbRecordFieldMapping> <name>AB_APPOINTMENTLINKID.value</name> <recordfield>AB_APPOINTMENTLINK.AB_APPOINTMENTLINK_ID</recordfield> diff --git a/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js b/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js index b603d5545bf136c0f5ab87ec05c4ab83d3ac6cc0..e95adef18a9cb958af3277c59ad305d5d4a786b6 100644 --- a/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js +++ b/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js @@ -1,6 +1,11 @@ -import("system.db"); +import("system.neon"); import("system.vars"); +import("system.db"); import("system.result"); -import("Context_lib") +import("Context_lib"); -result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECTTYPE"), vars.get("$field.OBJECTID")))); \ No newline at end of file +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECTID")) { + result.string(""); +} else if (vars.exists("$field.OBJECTTYPE") && vars.get("$field.OBJECTTYPE")) { + result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECTTYPE"), vars.get("$field.OBJECTID")))); +} \ No newline at end of file diff --git a/entity/AppointmentLink_entity/recordcontainers/db/recordfieldmappings/objectid.displayvalue/expression.js b/entity/AppointmentLink_entity/recordcontainers/db/recordfieldmappings/objectid.displayvalue/expression.js deleted file mode 100644 index 33554680cccd2c3d363443686457c41e0c1c5729..0000000000000000000000000000000000000000 --- a/entity/AppointmentLink_entity/recordcontainers/db/recordfieldmappings/objectid.displayvalue/expression.js +++ /dev/null @@ -1,4 +0,0 @@ -import("system.result"); -import("Context_lib"); - -result.string(ContextUtils.getNameSubselectSql("OBJECT_TYPE", "OBJECT_ROWID")) \ No newline at end of file