Skip to content
Snippets Groups Projects
Commit 0e4b4da4 authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

Merge branch '2021.1.0' into '2021.1'

2021.1.0

See merge request xrm/basic!964
parents 4deb61a6 14d9326b
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<column name="TABLENAME" type="NVARCHAR(127)"/> <column name="TABLENAME" type="NVARCHAR(127)"/>
<column name="FILENAME" type="NVARCHAR(127)"/> <column name="FILENAME" type="NVARCHAR(127)"/>
<column name="ROW_ID" type="CHAR(36)"/> <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="KEYWORD" type="VARCHAR(255)"/>
<column name="MIMETYPE" type="VARCHAR(127)"/> <column name="MIMETYPE" type="VARCHAR(127)"/>
<column name="PREVIEW" type="LONGBLOB"/> <column name="PREVIEW" type="LONGBLOB"/>
......
...@@ -769,7 +769,7 @@ AttributeRelationUtils.validateAttributeCount = function (pRowId, pObjectType, p ...@@ -769,7 +769,7 @@ AttributeRelationUtils.validateAttributeCount = function (pRowId, pObjectType, p
}, countObj); }, countObj);
} }
var possibleAttributes = AttributeUtil.getPossibleAttributes(pObjectType, undefined, pFilteredAttributeIds); var possibleAttributes = AttributeUtil.getPossibleAttributes(pObjectType, undefined, pFilteredAttributeIds) || [];
var minMaxCounts = []; var minMaxCounts = [];
if (possibleAttributes.length > 0) if (possibleAttributes.length > 0)
...@@ -794,8 +794,8 @@ AttributeRelationUtils.validateAttributeCount = function (pRowId, pObjectType, p ...@@ -794,8 +794,8 @@ AttributeRelationUtils.validateAttributeCount = function (pRowId, pObjectType, p
// get all possible parent attributes // get all possible parent attributes
var possibleParentAttributes = newSelect("distinct ATTRIBUTE_PARENT_ID") var possibleParentAttributes = newSelect("distinct ATTRIBUTE_PARENT_ID")
.from("AB_ATTRIBUTE") .from("AB_ATTRIBUTE")
.where("AB_ATTRIBUTE.AB_ATTRIBUTEID", possibleAttributes, SqlBuilder.IN()) .whereIfSet("AB_ATTRIBUTE.AB_ATTRIBUTEID", possibleAttributes, SqlBuilder.IN())
.arrayColumn(); .arrayColumn(true);
// remove empty elements // remove empty elements
possibleParentAttributes = possibleParentAttributes.filter(function (el) { return el != null && el != ""; }); 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