Skip to content
Snippets Groups Projects
Commit f9d327cf authored by Pascal Neub's avatar Pascal Neub
Browse files

merged 2021.1 into sales_pn_1081118_Offer_entity_onDBInser_asysbinary

parents 300c8660 0e4b4da4
No related branches found
No related tags found
No related merge requests found
......@@ -15,7 +15,7 @@
<column name="TABLENAME" type="NVARCHAR(127)"/>
<column name="FILENAME" type="NVARCHAR(127)"/>
<column name="ROW_ID" type="CHAR(36)"/>
<column name="DESCRIPTION" type="NVARCHAR(127)"/>
<column name="DESCRIPTION" type="NVARCHAR(2048)"/>
<column name="KEYWORD" type="VARCHAR(255)"/>
<column name="MIMETYPE" type="VARCHAR(127)"/>
<column name="PREVIEW" type="LONGBLOB"/>
......
......@@ -769,7 +769,7 @@ AttributeRelationUtils.validateAttributeCount = function (pRowId, pObjectType, p
}, countObj);
}
var possibleAttributes = AttributeUtil.getPossibleAttributes(pObjectType, undefined, pFilteredAttributeIds);
var possibleAttributes = AttributeUtil.getPossibleAttributes(pObjectType, undefined, pFilteredAttributeIds) || [];
var minMaxCounts = [];
if (possibleAttributes.length > 0)
......@@ -794,8 +794,8 @@ AttributeRelationUtils.validateAttributeCount = function (pRowId, pObjectType, p
// get all possible parent attributes
var possibleParentAttributes = newSelect("distinct ATTRIBUTE_PARENT_ID")
.from("AB_ATTRIBUTE")
.where("AB_ATTRIBUTE.AB_ATTRIBUTEID", possibleAttributes, SqlBuilder.IN())
.arrayColumn();
.whereIfSet("AB_ATTRIBUTE.AB_ATTRIBUTEID", possibleAttributes, SqlBuilder.IN())
.arrayColumn(true);
// remove empty elements
possibleParentAttributes = possibleParentAttributes.filter(function (el) { return el != null && el != ""; });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment