svn commit: r534890 - in /ofbiz/branches/release4.0/applications: order/webapp/ordermgr/order/ordercontactinfo.ftl party/webapp/partymgr/party/findparty.ftl party/widget/partymgr/CommonScreens.xml

[rayb-2]

Author: rayb
Date: Thu May  3 07:26:29 2007
New Revision: 534890

URL: http://svn.apache.org/viewvc?view=rev&rev=534890
Log:
Applied fix from trunk for revision: 534879
Fix for the links to searchorders screen, index is 1:n based rather than 0:n-1. Problem only shows when more than one page of results is displayed.

Modified:
    ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
    ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/findparty.ftl
    ofbiz/branches/release4.0/applications/party/widget/partymgr/CommonScreens.xml

Modified: ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?view=diff&rev=534890&r1=534889&r2=534890
==============================================================================
--- ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original)
+++ ofbiz/branches/release4.0/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Thu May  3 07:26:29 2007
@@ -55,7 +55,7 @@
                 <span>&nbsp;(<a href="${customerDetailLink}${partyId}" target="partymgr" class="buttontext">${partyId}</a>)</span>
                 <span>
                    <a href="<@ofbizUrl>/orderentry?partyId=${partyId}&amp;orderTypeId=${orderHeader.orderTypeId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNewOrder}</a>
-                   <a href="<@ofbizUrl>/searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyId}&amp;viewIndex=0&amp;viewSize=10</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderOtherOrders}</a>
+                   <a href="<@ofbizUrl>/searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyId}&amp;viewIndex=1&amp;viewSize=20</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderOtherOrders}</a>
                 </span>
               </#if>
             </div>

Modified: ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/findparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/findparty.ftl?view=diff&rev=534890&r1=534889&r2=534890
==============================================================================
--- ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/branches/release4.0/applications/party/webapp/partymgr/party/findparty.ftl Thu May  3 07:26:29 2007
@@ -247,7 +247,7 @@
           <td class="button-col align-float">
               <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a>
               <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)>
-                <a href="/ordermgr/control/searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyRow.partyId + externalKeyParam}&amp;viewIndex=0&amp;viewSize=10">${uiLabelMap.OrderOrders}</a>
+                <a href="/ordermgr/control/searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyRow.partyId + externalKeyParam}&amp;viewIndex=1&amp;viewSize=20">${uiLabelMap.OrderOrders}</a>
                 <a href="/ordermgr/control/FindQuote?partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderOrderQuotes}</a>
               </#if>
               <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)>

Modified: ofbiz/branches/release4.0/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/party/widget/partymgr/CommonScreens.xml?view=diff&rev=534890&r1=534889&r2=534890
==============================================================================
--- ofbiz/branches/release4.0/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/branches/release4.0/applications/party/widget/partymgr/CommonScreens.xml Thu May  3 07:26:29 2007
@@ -76,7 +76,7 @@
                                             <section>
                                                 <condition><if-has-permission permission="ORDERMGR" action="_VIEW"/></condition>
                                                 <widgets>
-                                                    <link target="/ordermgr/control/searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}&amp;viewIndex=0&amp;viewSize=10" url-mode="inter-app"
+                                                    <link target="/ordermgr/control/searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}&amp;viewIndex=1&amp;viewSize=20" url-mode="inter-app"
                                                         text="${uiLabelMap.OrderOrders}"/>
                                                     <link target="/ordermgr/control/FindQuote?partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}" url-mode="inter-app"
                                                         text="${uiLabelMap.OrderOrderQuotes}" style="buttontext"/>
@@ -223,7 +223,7 @@
                                             <section>
                                                 <condition><if-has-permission permission="ORDERMGR" action="_VIEW"/></condition>
                                                 <widgets>
-                                                    <link target="/ordermgr/control/searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyId}&amp;viewIndex=0&amp;viewSize=10" url-mode="inter-app"
+                                                    <link target="/ordermgr/control/searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyId}&amp;viewIndex=1&amp;viewSize=20" url-mode="inter-app"
                                                         text="${uiLabelMap.OrderOrders}"/>
                                                 </widgets>
                                             </section>