diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml index d700aacd49d12879155c7d8f10b08f3d619b7345..7f3a311100cc02768ba1001b28890bd9aacbdaf6 100644 --- a/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml +++ b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml @@ -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"/> diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js index 20c80caef6169b6cf056b192bec61ae87320761e..319191882def4f20d269f98c871bb2398869bfaa 100644 --- a/process/Attribute_lib/process.js +++ b/process/Attribute_lib/process.js @@ -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 != ""; });