[~pawan] did it correctly by fixing the bug independently and directly on trunk.
Pull requests/feature branches should simply be updated by pulling the latest changes of trunk and merge possible conflicts there. This is a common development process in every project which works with feature branches.
[~pierresmits] Merge conflicts are easy to solve in the local sandbox by using the proper tools (git mergetool...). The GitHub UI is not recommended in such cases.
> prepareProductDimensionData does not load correct fields in ProductDimension
> ----------------------------------------------------------------------------
>
> Key: OFBIZ-11465
> URL:
https://issues.apache.org/jira/browse/OFBIZ-11465> Project: OFBiz
> Issue Type: Sub-task
> Components: bi
> Affects Versions: Trunk
> Reporter: Pierre Smits
> Assignee: Pawan Verma
> Priority: Major
> Labels: ProductDimension, birt, dimension, dwh, product, service
> Fix For: Upcoming Branch
>
>
> With the implementation of the patch ofOFBIZ-10948 an error was introduced that led to fields in the ProductDimension to be populated in a wrong way.
> The replaced minilang code encompassed:
> {code:xml}
> <simple-method method-name="prepareProductDimensionData" short-description="">
> <entity-one entity-name="Product" value-field="product"/>
> <if-empty field="product">
> <add-error>
> <fail-property resource="ProductUiLabels" property="ProductProductNotFoundWithProduct"/>
> </add-error>
> </if-empty>
> <check-errors/>
> <make-value entity-name="ProductDimension" value-field="productDimension"/>
> <set-nonpk-fields map="product" value-field="productDimension"/>
> <get-related-one value-field="product" relation-name="ProductType" to-value-field="productType"/>
> <set field="productDimension.productType" from-field="productType.description"/>
> <field-to-result field="productDimension"/>
> </simple-method>
> {code}
> This was replace with groovy code:
> {code:java}
> def prepareProductDimensionData() {
> GenericValue product = from("Product").where("productId", parameters.productId).queryOne()
> if (product == null) {
> return error(UtilProperties.getMessage('ProductUiLabels', 'ProductProductNotFoundWithProduct', locale))
> }
> productDimension = delegator.makeValue("ProductDimension")
> productDimension.setNonPKFields(parameters)
> GenericValue productType = select("description").from("Product").where("productId", parameters.productId).queryOne()
> productDimension.productType = productType.description
> Map result = success()
> result.productDimension = productDimension
> return result
> }
> {code}
> 2 things happened:
> * the key-value pairs of the product were not injected into the projectDimension object, but rather only parameters (not including these parse);
> * the description of the productType associated with the product was not injected into the productDimension object, but rather the description of the product.
Locked
