Author: jleroux
Date: Fri Jan 20 13:50:38 2017
New Revision: 1779624
URL: http://svn.apache.org/viewvc?rev=1779624&view=rev
Log:
Fixed: Search operation on 'AllExamplesWithDesiredCustomerFeaturesReport'
entity causing exception
(OFBIZ-8822)
Adds missing entity-alias in condition-expr inside view-entity definitions
I stumbled upon this again in a custom project. I then found that it was
already fixed by OFBIZ-8822 but not backported
and decided it's better to have it fixed in R14 and R15 branches.
Modified:
ofbiz/branches/release14.12/specialpurpose/example/entitydef/entitymodel_view.xml
ofbiz/branches/release15.12/specialpurpose/example/entitydef/entitymodel_view.xml
Modified:
ofbiz/branches/release14.12/specialpurpose/example/entitydef/entitymodel_view.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/example/entitydef/entitymodel_view.xml?rev=1779624&r1=1779623&r2=1779624&view=diff
==============================================================================
---
ofbiz/branches/release14.12/specialpurpose/example/entitydef/entitymodel_view.xml
(original)
+++
ofbiz/branches/release14.12/specialpurpose/example/entitydef/entitymodel_view.xml
Fri Jan 20 13:50:38 2017
@@ -102,8 +102,8 @@ under the License.
<alias-all entity-alias="EFAAFV"/>
<entity-condition>
<condition-list combine="and">
- <condition-expr field-name="exampleTypeId" value="CONTRIVED"/>
- <condition-expr field-name="exampleFeatureApplTypeId"
value="REQUIRED"/>
+ <condition-expr entity-alias="EFAAFV"
field-name="exampleTypeId" operator="equals" value="CONTRIVED"/>
+ <condition-expr entity-alias="EFAAFV"
field-name="exampleFeatureApplTypeId" operator="equals" value="REQUIRED"/>
</condition-list>
<order-by field-name="exampleName"/>
</entity-condition>
@@ -122,7 +122,7 @@ under the License.
<key-map field-name="exampleFeatureApplTypeId"/>
</view-link>
<entity-condition>
- <condition-expr field-name="exampleFeatureApplTypeId"
value="DESIRED"/>
+ <condition-expr entity-alias="EXFTAPTP"
field-name="exampleFeatureApplTypeId" operator="equals" value="DESIRED"/>
</entity-condition>
</view-entity>
<view-entity entity-name="AllExamplesWithDesiredCustomerFeaturesReport"
package-name="org.ofbiz.example.example">
@@ -142,7 +142,7 @@ under the License.
<key-map field-name="exampleId"/>
</view-link>
<entity-condition>
- <condition-expr field-name="featureSourceEnumId"
value="EXFTSRC_CUSTOMER"/>
+ <condition-expr entity-alias="EXFT"
field-name="featureSourceEnumId" operator="equals" value="EXFTSRC_CUSTOMER"/>
<order-by field-name="exampleName"/>
</entity-condition>
</view-entity>
Modified:
ofbiz/branches/release15.12/specialpurpose/example/entitydef/entitymodel_view.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/example/entitydef/entitymodel_view.xml?rev=1779624&r1=1779623&r2=1779624&view=diff
==============================================================================
---
ofbiz/branches/release15.12/specialpurpose/example/entitydef/entitymodel_view.xml
(original)
+++
ofbiz/branches/release15.12/specialpurpose/example/entitydef/entitymodel_view.xml
Fri Jan 20 13:50:38 2017
@@ -102,8 +102,8 @@ under the License.
<alias-all entity-alias="EFAAFV"/>
<entity-condition>
<condition-list combine="and">
- <condition-expr field-name="exampleTypeId" value="CONTRIVED"/>
- <condition-expr field-name="exampleFeatureApplTypeId"
value="REQUIRED"/>
+ <condition-expr entity-alias="EFAAFV"
field-name="exampleTypeId" operator="equals" value="CONTRIVED"/>
+ <condition-expr entity-alias="EFAAFV"
field-name="exampleFeatureApplTypeId" operator="equals" value="REQUIRED"/>
</condition-list>
<order-by field-name="exampleName"/>
</entity-condition>
@@ -122,7 +122,7 @@ under the License.
<key-map field-name="exampleFeatureApplTypeId"/>
</view-link>
<entity-condition>
- <condition-expr field-name="exampleFeatureApplTypeId"
value="DESIRED"/>
+ <condition-expr entity-alias="EXFTAPTP"
field-name="exampleFeatureApplTypeId" operator="equals" value="DESIRED"/>
</entity-condition>
</view-entity>
<view-entity entity-name="AllExamplesWithDesiredCustomerFeaturesReport"
package-name="org.ofbiz.example.example">
@@ -142,7 +142,7 @@ under the License.
<key-map field-name="exampleId"/>
</view-link>
<entity-condition>
- <condition-expr field-name="featureSourceEnumId"
value="EXFTSRC_CUSTOMER"/>
+ <condition-expr entity-alias="EXFT"
field-name="featureSourceEnumId" operator="equals" value="EXFTSRC_CUSTOMER"/>
<order-by field-name="exampleName"/>
</entity-condition>
</view-entity>
