Skip to content
Snippets Groups Projects
Commit 916a45cd authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

fix attributeRelationCondition

parent 17638c2f
No related branches found
No related tags found
No related merge requests found
import("system.logging");
import("system.util");
import("Util_lib");
import("system.vars");
......@@ -56,9 +57,11 @@ else if (showEmpty || rowId)
attributeRelationJoin += " and " + subCondition;
sqlCondition.preparedValues = subCondition.preparedValues.concat(sqlCondition.preparedValues);
}
if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
if (vars.exists("$param.FilteredAttributeIds_param") && vars.getString("$param.FilteredAttributeIds_param"))
{
let filteredIds = JSON.parse(vars.getString("$param.FilteredAttributeIds_param"));
logging.log(filteredIds.toSource())
subCondition.clear();
let filteredIdChildren = AttributeUtil.getAllChildren(filteredIds);
......@@ -67,7 +70,8 @@ else if (showEmpty || rowId)
this.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
}, subCondition);
sqlCondition.andSqlCondition(subCondition);
// return nothing if filteredAttributeIds is an empty array. (--> and 1=2)
sqlCondition.andSqlCondition(subCondition, "1=2");
}
}
......
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