[ofbiz-framework] branch release18.12 updated: Fixed: Incorrect mapping for Lookup Purchase Order (#273)

[Deepak Dixit-5]

This is an automated email from the ASF dual-hosted git repository.

deepak pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new 6616a02  Fixed: Incorrect mapping for Lookup Purchase Order (#273)
6616a02 is described below

commit 6616a0208efc92d6df66ed6b4bd4149799615908
Author: Deepak Dixit <[hidden email]>
AuthorDate: Fri Feb 12 16:16:07 2021 +0530

    Fixed: Incorrect mapping for Lookup Purchase Order (#273)
   
    (OFBIZ-12143)
   
    This issue was due to common form is being used for LookupPurchaseOrderHeaderAndShipInfo and LookupOrderHeaderAndShipInfo screen. Passed the paginateTargetUrl from screen to make sure pagination works properly
    Thanks Rajesh Kumar for reporting the issue
---
 applications/order/widget/ordermgr/FieldLookupForms.xml | 2 +-
 applications/order/widget/ordermgr/LookupScreens.xml    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/applications/order/widget/ordermgr/FieldLookupForms.xml b/applications/order/widget/ordermgr/FieldLookupForms.xml
index bb4ea88..115912e 100644
--- a/applications/order/widget/ordermgr/FieldLookupForms.xml
+++ b/applications/order/widget/ordermgr/FieldLookupForms.xml
@@ -118,7 +118,7 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListLookupOrderHeaderAndShipInfo" list-name="listIt" title="" type="list"
-        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupOrderHeaderAndShipInfo">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="${paginateTargetUrl}">
         <actions>
             <service service-name="performFind" result-map="result" result-map-list="listIt">
                 <field-map field-name="inputFields" from-field="parameters"/>
diff --git a/applications/order/widget/ordermgr/LookupScreens.xml b/applications/order/widget/ordermgr/LookupScreens.xml
index 3ed2bf0..7622ae9 100644
--- a/applications/order/widget/ordermgr/LookupScreens.xml
+++ b/applications/order/widget/ordermgr/LookupScreens.xml
@@ -58,6 +58,7 @@ under the License.
             <actions>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" from-field="uiLabelMap.PageTitleLookupOrderHeaderAndShipInfo"/>
+                <set field="paginateTargetUrl" value="LookupOrderHeaderAndShipInfo"/>
                 <set field="parameters.roleTypeId" to-scope="screen" default-value="SHIP_TO_CUSTOMER"/>
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
@@ -87,6 +88,7 @@ under the License.
             <actions>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" from-field="uiLabelMap.PageTitleLookupPurchaseOrderHeaderAndShipInfo"/>
+                <set field="paginateTargetUrl" value="LookupPurchaseOrderHeaderAndShipInfo"/>
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
                 <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/>