Skip to content
Snippets Groups Projects
Commit cf0ad3fb authored by S.Listl's avatar S.Listl
Browse files

Attribute filter fix for boolean

parent 379943b8
No related branches found
No related tags found
No related merge requests found
...@@ -107,7 +107,7 @@ AttributeFilterExtensionMaker.getFilterCondition = function(pObjectType, pFilter ...@@ -107,7 +107,7 @@ AttributeFilterExtensionMaker.getFilterCondition = function(pObjectType, pFilter
var attributeId = name.id; var attributeId = name.id;
var attributeType = name.type; var attributeType = name.type;
if (attributeType == $AttributeTypes.VOID.toString()) if (attributeType == $AttributeTypes.VOID.toString() || (attributeType == $AttributeTypes.BOOLEAN.toString() && (pOperatorName == "IS NOT NULL" || pOperatorName == "IS NULL")))
{ {
preparedValues.push([pObjectType, SqlUtils.getSingleColumnType("AB_ATTRIBUTERELATION.OBJECT_TYPE")]); preparedValues.push([pObjectType, SqlUtils.getSingleColumnType("AB_ATTRIBUTERELATION.OBJECT_TYPE")]);
preparedValues.push([attributeId, SqlUtils.getSingleColumnType("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID")]); preparedValues.push([attributeId, SqlUtils.getSingleColumnType("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID")]);
...@@ -128,7 +128,13 @@ AttributeFilterExtensionMaker.getFilterCondition = function(pObjectType, pFilter ...@@ -128,7 +128,13 @@ AttributeFilterExtensionMaker.getFilterCondition = function(pObjectType, pFilter
var dbField = AttributeTypeUtil.getDatabaseField(name.type); var dbField = AttributeTypeUtil.getDatabaseField(name.type);
var condition = pCondition; var condition = pCondition;
condition = condition.replace("{'table.column'}", dbField, "g"); if (attributeType == $AttributeTypes.BOOLEAN.toString())
condition = dbField + (pOperatorName == "LIKE" ? " = " : " != ") + pRawValue;
else
{
condition = pCondition;
condition = condition.replace("{'table.column'}", dbField, "g");
}
preparedValues.push([pObjectType, SqlUtils.getSingleColumnType("AB_ATTRIBUTERELATION.OBJECT_TYPE")]); preparedValues.push([pObjectType, SqlUtils.getSingleColumnType("AB_ATTRIBUTERELATION.OBJECT_TYPE")]);
preparedValues.push([attributeId, SqlUtils.getSingleColumnType("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID")]); preparedValues.push([attributeId, SqlUtils.getSingleColumnType("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID")]);
......
...@@ -1159,7 +1159,7 @@ AttributeUsageUtil.removeDuplicates = function (pAttributeId) ...@@ -1159,7 +1159,7 @@ AttributeUsageUtil.removeDuplicates = function (pAttributeId)
var attributeSelect = newSelect("AB_ATTRIBUTEUSAGEID, AB_ATTRIBUTE_ID, OBJECT_TYPE") var attributeSelect = newSelect("AB_ATTRIBUTEUSAGEID, AB_ATTRIBUTE_ID, OBJECT_TYPE")
.from("AB_ATTRIBUTEUSAGE") .from("AB_ATTRIBUTEUSAGE")
.and(null, newSelect("AB_ATTRIBUTEUSAGEID") .where(null, newSelect("AB_ATTRIBUTEUSAGEID")
.from("AB_ATTRIBUTEUSAGE AU") .from("AB_ATTRIBUTEUSAGE AU")
.where("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AU.AB_ATTRIBUTE_ID") .where("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AU.AB_ATTRIBUTE_ID")
.and("AB_ATTRIBUTEUSAGE.OBJECT_TYPE = AU.OBJECT_TYPE") .and("AB_ATTRIBUTEUSAGE.OBJECT_TYPE = AU.OBJECT_TYPE")
......
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