From c0c703d1cf91f3f468c88ab728a578490534d1ca Mon Sep 17 00:00:00 2001
From: "S.Listl" <s.listl@adito.de>
Date: Thu, 28 Nov 2019 13:48:25 +0000
Subject: [PATCH] AttributeUsage preset max_count for inherited usages
(cherry picked from commit 29e295e38be4f7497fb3326a2f9689ce00b6399b)
---
process/Attribute_lib/process.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 58e2cf8aeb..d037b92f27 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -1034,15 +1034,14 @@ function AttributeUsageUtil () {}
* @param {String} pAttributeId the id of the superordinate attribute
* @param {String} pObjectType the context
*/
-AttributeUsageUtil.insertChildrenUsages = function (pAttributeId, pObjectType)
{
if (!pAttributeId)
return;
var table = "AB_ATTRIBUTEUSAGE";
- var columns = ["AB_ATTRIBUTEUSAGEID", "AB_ATTRIBUTE_ID", "OBJECT_TYPE"];
+ var columns = ["AB_ATTRIBUTEUSAGEID", "AB_ATTRIBUTE_ID", "OBJECT_TYPE", "MAX_COUNT"];
var types = db.getColumnTypes(table, columns);
- var sqlSelect = "select AB_ATTRIBUTEID, "
+ var sqlSelect = "select AB_ATTRIBUTEID, ATTRIBUTE_TYPE, "
+ " (select count(*) from AB_ATTRIBUTEUSAGE where AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID and OBJECT_TYPE = '"
+ pObjectType + "') = 0 from AB_ATTRIBUTE";
@@ -1059,9 +1058,12 @@ AttributeUsageUtil.insertChildrenUsages = function (pAttributeId, pObjectType)
attributes.forEach(function (row)
{
- if (row[1] == "true")
+ if (row[2] == "true")
{
- let values = [util.getNewUUID(), row[0], pObjectType];
+ let maxCount = row[1].trim() == $AttributeTypes.BOOLEAN || row[1].trim() == $AttributeTypes.VOID
+ ? "1"
+ : "";
+ let values = [util.getNewUUID(), row[0], pObjectType, maxCount];
inserts.push([table, columns, types, values]);
}
_addInserts(row[0], pObjectType);
--
GitLab