From d51b46ef40f47b656f76900518a9a5e11e55afde Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 12 Mar 2019 09:55:44 +0100
Subject: [PATCH] Attribute tree optimization
---
.../children/newchildattribute/onActionProcess.js | 2 ++
.../entityfields/full_attribute_name/valueProcess.js | 3 ++-
others/db_changes/data_alias/basic/2019.2/AttributeKeyword.xml | 3 +++
process/Attribute_lib/process.js | 2 ++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
index 1ec2bc6c8d..8eaaf95dc4 100644
--- a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
+++ b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
@@ -10,5 +10,7 @@ if (vars.exists("$local.rows"))
var type = row[0].ATTRIBUTE_TYPE.trim();
if (type == $AttributeTypes.GROUP || type == $AttributeTypes.COMBO)
params["attrParentId_param"] = row[0].AB_ATTRIBUTEID;
+ else if (row[0].ATTRIBUTE_PARENT_ID)
+ params["attrParentId_param"] = row[0].ATTRIBUTE_PARENT_ID;
}
neon.openContext("Attribute", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js b/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js
index 40820d4633..bbb180a80e 100644
--- a/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js
@@ -2,4 +2,5 @@ import("system.vars");
import("system.result");
import("Attribute_lib");
-result.string(AttributeUtil.getFullAttributeName(vars.get("$field.AB_ATTRIBUTEID")));
+var parentName = AttributeUtil.getFullAttributeName(vars.get("$field.ATTRIBUTE_PARENT_ID"));
+result.string((parentName ? parentName + " / " : "") + vars.get("$field.ATTRIBUTE_NAME"));
diff --git a/others/db_changes/data_alias/basic/2019.2/AttributeKeyword.xml b/others/db_changes/data_alias/basic/2019.2/AttributeKeyword.xml
index 9e0b5a7112..f409c3f08a 100644
--- a/others/db_changes/data_alias/basic/2019.2/AttributeKeyword.xml
+++ b/others/db_changes/data_alias/basic/2019.2/AttributeKeyword.xml
@@ -13,5 +13,8 @@
<addColumn tableName="AB_ATTRIBUTERELATION">
<column name="MEMO_VALUE" type="NCLOB"/>
</addColumn>
+ <createIndex indexName="IDX_ATTRPARENT" tableName="AB_ATTRIBUTE">
+ <column name="ATTRIBUTE_PARENT_ID"/>
+ </createIndex>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 010f064aef..bc1a40ea59 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -64,6 +64,8 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFi
*/
AttributeUtil.getFullAttributeName = function (pAttributeId)
{
+ if (!pAttributeId)
+ return "";
var attributeNames = [];
var attribute;
var idType = SqlUtils.getSingleColumnType("AB_ATTRIBUTE.AB_ATTRIBUTEID");
--
GitLab