test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 03:38:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-8882 IllegalArgumentException occurred when trying to apply a filter with the dynamic attribute condition

Browse Source
This commit is contained in:
Andrey Subbotin 2017-03-31 18:24:11 +04:00
parent bfb275d606
commit 608f29f5e1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/gui/src/com/haulmont/cuba/gui/components/filter/edit/DynamicAttributesConditionFrame.java
View File

@ -29,6 +29,7 @@ import com.haulmont.cuba.core.entity.Entity;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.MessageTools;
import com.haulmont.cuba.core.global.Metadata;
import com.haulmont.cuba.core.global.ReferenceToEntitySupport;
import com.haulmont.cuba.core.global.filter.Op;
import com.haulmont.cuba.gui.components.Frame;
import com.haulmont.cuba.gui.components.Label;
@ -71,6 +72,9 @@ public class DynamicAttributesConditionFrame extends ConditionFrame<DynamicAttri
@Inject
protected MessageTools messageTools;
@Inject
protected ReferenceToEntitySupport referenceToEntitySupport;
@Override
public void init(Map<String, Object> params) {
super.init(params);
@ -138,10 +142,12 @@ public class DynamicAttributesConditionFrame extends ConditionFrame<DynamicAttri
ConditionParamBuilder paramBuilder = AppBeans.get(ConditionParamBuilder.class);
paramName = paramBuilder.createParamName(condition);
String cavEntityId = referenceToEntitySupport.getReferenceIdPropertyName(condition.getDatasource().getMetaClass());
String where;
if (op == Op.NOT_EMPTY) {
where = "(exists (select " + cavAlias + " from sys$CategoryAttributeValue " + cavAlias +
" where " + cavAlias + ".entityId=" +
" where " + cavAlias + ".entity." + cavEntityId + "=" +
"{E}" +
propertyPath +
".id and " + cavAlias + ".categoryAttribute.id='" +
@ -149,7 +155,7 @@ public class DynamicAttributesConditionFrame extends ConditionFrame<DynamicAttri
} else {
String valueFieldName = "stringValue";
if (Entity.class.isAssignableFrom(javaClass))
valueFieldName = "entityValue";
valueFieldName = "entityValue." + referenceToEntitySupport.getReferenceIdPropertyName(metadata.getClassNN(javaClass)) ;
else if (String.class.isAssignableFrom(javaClass))
valueFieldName = "stringValue";
else if (Integer.class.isAssignableFrom(javaClass))
@ -169,7 +175,7 @@ public class DynamicAttributesConditionFrame extends ConditionFrame<DynamicAttri
if (Op.IN.equals(op) || Op.NOT_IN.equals(op))
paramStr = " ( ? ) ";
where = cavAlias + ".entityId=" +
where = cavAlias + ".entity." + cavEntityId + "=" +
"{E}" +
propertyPath +
".id and " + cavAlias + "." +
@ -181,7 +187,7 @@ public class DynamicAttributesConditionFrame extends ConditionFrame<DynamicAttri
where = where.replace("?", ":" + paramName);
} else {
where = "(exists (select " + cavAlias + " from sys$CategoryAttributeValue " + cavAlias +
" where " + cavAlias + ".entityId=" + "{E}" + propertyPath +".id and "
" where " + cavAlias + ".entity." + cavEntityId + "=" + "{E}" + propertyPath + ".id and "
+ cavAlias + "." + valueFieldName + " = :" + paramName + " and " +
cavAlias + ".categoryAttribute.id='" + attributeLookup.<CategoryAttribute>getValue().getId() + "'))";
}