From b1f9182b6c16f15240a7a3fa993a74f0acc73738 Mon Sep 17 00:00:00 2001 From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local> Date: Fri, 24 Jan 2020 14:37:46 +0100 Subject: [PATCH] Attribute ParentId_param --- entity/Attribute_entity/Attribute_entity.aod | 16 ++++++++++++++++ .../attribute_parent_id/valueProcess.js | 4 ++-- .../newchildattribute/onActionProcess.js | 4 ++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod index 5cfc044c65..2c91847336 100644 --- a/entity/Attribute_entity/Attribute_entity.aod +++ b/entity/Attribute_entity/Attribute_entity.aod @@ -167,6 +167,10 @@ <name>ChildType_param</name> <expose v="false" /> </entityParameter> + <entityParameter> + <name>ParentId_param</name> + <expose v="false" /> + </entityParameter> </children> </entityProvider> <entityField> @@ -197,6 +201,10 @@ <name>ThemeObjectRowId_param</name> <expose v="false" /> </entityParameter> + <entityParameter> + <name>ParentId_param</name> + <expose v="false" /> + </entityParameter> </children> </entityProvider> <entityConsumer> @@ -334,8 +342,16 @@ <name>ChildType_param</name> <expose v="false" /> </entityParameter> + <entityParameter> + <name>ParentId_param</name> + <expose v="false" /> + </entityParameter> </children> </entityProvider> + <entityParameter> + <name>ParentId_param</name> + <expose v="true" /> + </entityParameter> </entityFields> <recordContainers> <jDitoRecordContainer> diff --git a/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js b/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js index ec0073a5e9..33e1114869 100644 --- a/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js +++ b/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js @@ -2,5 +2,5 @@ import("system.neon"); import("system.result"); import("system.vars"); -if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.AttrParentId_param") && vars.get("$param.AttrParentId_param") && vars.get("$this.value") == null) - result.string(vars.get("$param.AttrParentId_param")); \ No newline at end of file +if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.ParentId_param") && vars.get("$this.value") == null) + result.string(vars.get("$param.ParentId_param")); \ No newline at end of file diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js index a7e3d7f4e6..20effae6f9 100644 --- a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js +++ b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js @@ -8,8 +8,8 @@ if (vars.exists("$local.rows")) var row = vars.get("$local.rows"); var type = row[0].ATTRIBUTE_TYPE.trim(); if (AttributeTypeUtil.isGroupType(type)) - params["AttrParentId_param"] = row[0].UID; + params["ParentId_param"] = row[0].UID; else if (row[0].ATTRIBUTE_PARENT_ID) - params["AttrParentId_param"] = row[0].ATTRIBUTE_PARENT_ID; + params["ParentId_param"] = row[0].ATTRIBUTE_PARENT_ID; } neon.openContext("Attribute", null, null, neon.OPERATINGSTATE_NEW, params); \ No newline at end of file -- GitLab