From e65594fea8dfa6df099fcf84293ea5e51983735b Mon Sep 17 00:00:00 2001
From: Nicolas Malin <nmalin@apache.org>
Date: Sat, 17 Sep 2016 16:55:59 +0000
Subject: [PATCH] Fix for : LookupAccount search screen 'Find' button redirect
 to Lookup Group (OFBIZ-7117)

Use a dynamic target resolution on form LookupPerson and LookupPartyGroup that call by different LookupScreen so different URI.
With a static target, we loosed the preparation on dedicate parameter search realize by the dedicate LookupScreen like LookupAccount or LookupLead

Thanks : Florian Montalbano to spot and explain on detail the problem.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761257 13f79535-47bb-0310-9956-ffa450edef68
---
 applications/party/widget/partymgr/LookupForms.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/applications/party/widget/partymgr/LookupForms.xml b/applications/party/widget/partymgr/LookupForms.xml
index 1141246fc35..fdf85700d28 100644
--- a/applications/party/widget/partymgr/LookupForms.xml
+++ b/applications/party/widget/partymgr/LookupForms.xml
@@ -169,7 +169,7 @@ under the License.
     </form>
 
     <!-- Person Lookup forms -->
-    <form name="LookupPerson" type="single" target="LookupPerson"
+    <form name="LookupPerson" type="single" target="${parameters.thisRequestUri}"
         header-row-style="header-row" default-table-style="basic-table">
         <!--<auto-fields-entity entity-name="Person" default-field-type="find"/>-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
@@ -179,7 +179,7 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
     </form>
 
-    <form name="ListLookupPerson" type="list" list-name="listIt" paginate-target="LookupPerson"
+    <form name="ListLookupPerson" type="list" list-name="listIt" paginate-target="${parameters.thisRequestUri}"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>
@@ -257,7 +257,7 @@ under the License.
         <field name="groupName" title="${uiLabelMap.PartyGroupName}"><display description="${groupName}"/></field>
     </form>
 
-    <form name="LookupPartyGroup" type="single" target="LookupPartyGroup"
+    <form name="LookupPartyGroup" type="single" target="${parameters.thisRequestUri}"
         header-row-style="header-row" default-table-style="basic-table">
         <!--<auto-fields-entity entity-name="PartyGroup" default-field-type="find"/>-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
@@ -266,7 +266,7 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
     </form>
 
-    <form name="ListLookupPartyGroup" type="list" list-name="listIt" paginate-target="LookupPartyGroup"
+    <form name="ListLookupPartyGroup" type="list" list-name="listIt" paginate-target="${parameters.thisRequestUri}"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <script location="component://party/groovyScripts/party/FindLookUp.groovy"/>