svn commit: r1340356 - in /ofbiz/branches/release10.04: ./ applications/order/script/org/ofbiz/order/order/OrderServices.xml applications/party/widget/partymgr/PartyForms.xml

Author: jleroux
Date: Sat May 19 06:41:45 2012
New Revision: 1340356

URL: http://svn.apache.org/viewvc?rev=1340356&view=rev
Log:
"Applied fix from trunk for revision: 1340352  "
------------------------------------------------------------------------
r1340352 | jleroux | 2012-05-19 08:39:24 +0200 (sam., 19 mai 2012) | 7 lines

A patch from Leon for "Exception there when trying to update order's "Shipping Destination Address"" https://issues.apache.org/jira/browse/OFBIZ-4865

If click the "update" button of "Shipping Destination Address" in order view page, an exception thrown out as:
    The Following Errors Occurred:
    BeanShell execution caused an error: Sourced file: inline evaluation of: `` shipmentMethod = parameters.get("shipmentMethod"); if(s . . . ''

I searched the log and find the root cause is "java.lang.ArrayIndexOutOfBoundsException" from bsh script. As Paul told, there should be at least two "@" chars in "shipmentmethod" value. So I guess maybe somewhere "@" is missing. I tried to lookup for codes which construct parameters map for calling, and fortunately, I found it.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml
    ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1340352

Modified: ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=1340356&r1=1340355&r2=1340356&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original)
+++ ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/OrderServices.xml Sat May 19 06:41:45 2012
@@ -709,7 +709,7 @@ under the License.
            <if-not-empty field="shipGroupList">
               <iterate list="shipGroupList" entry="shipGroup">
                  <set field="inputMap.shipGroupSeqId" from-field="shipGroup.shipGroupSeqId"/>
-                 <set field="inputMap.shipmentMethod" value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId}"/>
+                 <set field="inputMap.shipmentMethod" value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId}@${shipGroup.carrierRoleTypeId}"/>
                  <set field="inputMap.oldContactMechId" from-field="parameters.oldContactMechId"/>
                  <set-service-fields to-map="orderItemShipGroupMap" service-name="updateOrderItemShipGroup" map="inputMap"/>
                  <call-service service-name="updateOrderItemShipGroup" in-map-name="orderItemShipGroupMap" include-user-login="true"/>

Modified: ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml?rev=1340356&r1=1340355&r2=1340356&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/release10.04/applications/party/widget/partymgr/PartyForms.xml Sat May 19 06:41:45 2012
@@ -90,7 +90,7 @@ under the License.
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
-        <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
+        <field name="cancelLink" title=" " widget-style="smallSubmit">
             <hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
                 <parameter param-name="partyId"/>
             </hyperlink>