Fixed: In entitymodel.xsd entity-alias for condition-expr must be required
(OFBIZ-9184)
Currently in the entitymodel.xsd the line
<xs:attribute name="entity-alias" type="xs:string"/>
is wrong, should be
<xs:attribute name="entity-alias" type="xs:string" use="required"/>
Else in line
this.entityAlias = entityAlias;
in ModelViewEntity.ViewConditionExpr()
this.entityAlias
receives null.
All supported branches are concerned
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1779625 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/applications/accounting/entitydef/entitymodel_reports.xml b/applications/accounting/entitydef/entitymodel_reports.xml
index 8cadef8..8a6ba02 100644
--- a/applications/accounting/entitydef/entitymodel_reports.xml
+++ b/applications/accounting/entitydef/entitymodel_reports.xml
@@ -107,7 +107,7 @@
<view-link entity-alias="INV" rel-entity-alias="PFR" rel-optional="true">
<key-map field-name="partyIdFrom" rel-field-name="partyId"/>
<entity-condition>
- <condition-expr entity-alias="PFR" field-name="partyIdentificationTypeId" value="INVOICE_EXPORT"/>
+ <condition-expr field-name="partyIdentificationTypeId" value="INVOICE_EXPORT"/>
</entity-condition>
</view-link>
<view-link entity-alias="INV" rel-entity-alias="PTO" rel-optional="true">
diff --git a/framework/entity/dtd/entitymodel.xsd b/framework/entity/dtd/entitymodel.xsd
index 088b5f2..6a3f97c 100644
--- a/framework/entity/dtd/entitymodel.xsd
+++ b/framework/entity/dtd/entitymodel.xsd
@@ -435,7 +435,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.condition-expr">
- <xs:attribute name="entity-alias" type="xs:string"/>
+ <xs:attribute name="entity-alias" type="xs:string" use="required"/>
<xs:attribute name="field-name" type="xs:string" use="required"/>
<xs:attribute name="operator" default="equals">
<xs:simpleType>
