svn commit: r759495 - in /ofbiz/trunk/applications: accounting/webapp/accounting/agreement/ content/widget/compdoc/ humanres/widget/forms/ marketing/webapp/marketing/campaign/ order/webapp/ordermgr/order/ order/webapp/ordermgr/quote/ product/webapp/cat...

Author: jleroux
Date: Sat Mar 28 16:14:58 2009
New Revision: 759495

URL: http://svn.apache.org/viewvc?rev=759495&view=rev
Log:
8th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements


Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?rev=759495&r1=759494&r2=759495&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Sat Mar 28 16:14:58 2009
@@ -173,7 +173,11 @@
             <display-entity entity-name="InvoiceItemType" />
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="removeAgreementItemTerm?agreementTermId=${agreementTermId}&amp;agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
+            <hyperlink target="removeAgreementItemTerm" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <parameter param-name="agreementTermId" from-field="agreementTermId"/>
+ <parameter param-name="agreementId" from-field="agreementId"/>
+ <parameter param-name="agreementItemSeqId" from-field="agreementItemSeqId"/>
+ </hyperlink>
         </field>
     </form>
     <form name="ListAgreementTerms" target="updateAgreementTerm" list-name="agreementTerms" paginate-target="ListAgreementTerms" title="" type="list"
@@ -262,7 +266,11 @@
         </field>
         <field name="price" widget-area-style="align-text"><display/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="removeAgreementItemProduct?productId=${productId}&amp;agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
+            <hyperlink target="removeAgreementItemProduct" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <parameter param-name="productId" from-field="productId"/>
+ <parameter param-name="agreementId" from-field="agreementId"/>
+ <parameter param-name="agreementItemSeqId" from-field="agreementItemSeqId"/>
+ </hyperlink>
         </field>
     </form>
     <form name="ListAgreementItemSupplierProducts" list-name="agreementProducts" target="" title="" type="list" paginate-target="ListAgreementItemSupplierProducts"
@@ -458,7 +466,11 @@
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${lastName}"/>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="removeAgreementItemParty?partyId=${partyId}&amp;agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+            <hyperlink target="removeAgreementItemParty" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="agreementId" from-field="agreementId"/>
+ <parameter param-name="agreementItemSeqId" from-field="agreementItemSeqId"/>
+ </hyperlink>
         </field>
     </form>
     <form name="EditAgreementItemParty" type="single" target="updateAgreementItemParty" title="" default-map-name="agreementPartyApplic"
@@ -484,7 +496,11 @@
             <display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoId}]"/>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="removeAgreementGeographicalApplic?geoId=${geoId}&amp;agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+            <hyperlink target="removeAgreementGeographicalApplic" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="geoId" from-field="geoId"/>
+ <parameter param-name="agreementId" from-field="agreementId"/>
+ <parameter param-name="agreementItemSeqId" from-field="agreementItemSeqId"/>
+ </hyperlink>
         </field>
     </form>
     <form name="EditAgreementGeographicalApplic" type="single" target="updateAgreementGeographicalApplic" title="" default-map-name="agreementGeographicalApplic"
@@ -547,7 +563,11 @@
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field>
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="deleteAgreementRole?agreementId=${agreementId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
+            <hyperlink target="deleteAgreementRole" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <parameter param-name="agreementId" from-field="agreementId"/>
+ <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+ </hyperlink>
         </field>
     </form>
     <form name="AddAgreementRole" type="single" target="createAgreementRole"

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=759495&r1=759494&r2=759495&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Sat Mar 28 16:14:58 2009
@@ -448,7 +448,11 @@
         </field>
         <field name="addSurveyResponse" map-name="dummy" widget-style="buttontext"
             use-when="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; dataResource!=null &amp;&amp; dataResource.get(&quot;relatedDetailId&quot;)==null &amp;&amp; templateDataResource!=null &amp;&amp; templateDataResource.get(&quot;relatedDetailId&quot;)!=null">
-            <hyperlink description="${uiLabelMap.CommonCreate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId})" target="EditSurveyResponse?surveyId=${templateDataResource.relatedDetailId}&amp;dataResourceId=${dataResource.dataResourceId}&amp;rootContentId=${rootContentId}" also-hidden="false" target-window="_blank"/>
+            <hyperlink description="${uiLabelMap.CommonCreate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId})" target="EditSurveyResponse" also-hidden="false" target-window="_blank">
+ <parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/>
+ <parameter param-name="dataResourceId" from-field="dataResource.dataResourceId"/>
+ <parameter param-name="rootContentId" from-field="rootContentId"/>
+ </hyperlink>
         </field>
         <field name="updateSurveyResponse" map-name="dummy" widget-style="buttontext"
             use-when="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; dataResource!=null &amp;&amp; dataResource.get(&quot;relatedDetailId&quot;)!=null &amp;&amp; templateDataResource!=null &amp;&amp; templateDataResource.get(&quot;relatedDetailId&quot;)!=null">

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=759495&r1=759494&r2=759495&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Sat Mar 28 16:14:58 2009
@@ -108,7 +108,11 @@
         <field name="fromDate" title="${uiLabelMap.CommonDate}"><display/></field>        
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmplPositionFulfillment?emplPositionId=${emplPositionId}&amp;partyId=${partyId}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+            <hyperlink target="deleteEmplPositionFulfillment" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="emplPositionId" from-field="emplPositionId"/>
+ <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="fromDate" from-field="fromDate"/>
+ </hyperlink>
         </field>
     </form>
     <form name="AddEmplPositionFulfillment" type="single" target="createEmplPositionFulfillment" title=""
@@ -200,7 +204,11 @@
         <field name="fromDate"><display /></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmplPositionResponsibility?emplPositionId=${emplPositionId}&amp;responsibilityTypeId=${responsibilityTypeId}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+            <hyperlink target="deleteEmplPositionResponsibility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="emplPositionId" from-field="emplPositionId"/>
+ <parameter param-name="responsibilityTypeId" from-field="responsibilityTypeId"/>
+ <parameter param-name="fromDate" from-field="fromDate"/>
+ </hyperlink>
         </field>        
     </form>
     <form name="AddEmplPositionResponsibility" type="single" target="createEmplPositionResponsibility" title=""
@@ -227,7 +235,11 @@
         <field name="fromDate"><display /></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteValidResponsibility?emplPositionTypeId=${emplPositionId}&amp;responsibilityTypeId=${responsibilityTypeId}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+            <hyperlink target="deleteValidResponsibility" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="emplPositionTypeId" from-field="emplPositionId"/>
+ <parameter param-name="responsibilityTypeId" from-field="responsibilityTypeId"/>
+ <parameter param-name="fromDate" from-field="fromDate"/>
+ </hyperlink>
         </field>
     </form>
     <form name="AddValidResponsibility" type="single" target="createValidResponsibility" title=""

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml?rev=759495&r1=759494&r2=759495&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Sat Mar 28 16:14:58 2009
@@ -160,7 +160,11 @@
         </field>
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmployeeQualification?partyId=${partyId}&amp;partyQualTypeId=${partyQualTypeId}&amp;fromDate=${fromDate}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/>
+            <hyperlink target="deleteEmployeeQualification" also-hidden="false" description="${uiLabelMap.CommonDelete}">
+ <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="partyQualTypeId" from-field="partyQualTypeId"/>
+ <parameter param-name="fromDate" from-field="fromDate"/>
+ </hyperlink>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
     </form>
@@ -191,7 +195,11 @@
         <field name="thruDate"><date-time type="timestamp"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmployeeTraining?partyId=${partyId}&amp;trainingClassTypeId=${trainingClassTypeId}&amp;fromDate=${fromDate}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/>
+            <hyperlink target="deleteEmployeeTraining" also-hidden="false" description="${uiLabelMap.CommonDelete}">
+ <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="trainingClassTypeId" from-field="trainingClassTypeId"/>
+ <parameter param-name="fromDate" from-field="fromDate"/>
+ </hyperlink>
         </field>
     </form>
     <form name="AddEmplLeave" type="single" target="createEmplLeave">

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=759495&r1=759494&r2=759495&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml Sat Mar 28 16:14:58 2009
@@ -60,7 +60,11 @@
         <field name="referredByPartyId" use-when="referredByPartyId!=null"><lookup target-form-name="LookupPartyName"/></field>
         <field name="applicationDate" title="${uiLabelMap.FormFieldTitle_applicationDate}"><date-time/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmploymentApp?applicationId=${applicationId}&amp;&amp;partyId=${partyId}&amp;&amp;referredByPartyId=${referredByPartyId}" description="${uiLabelMap.CommonDelete}" also-hidden="true"/>
+            <hyperlink target="deleteEmploymentApp" description="${uiLabelMap.CommonDelete}" also-hidden="true">
+ <parameter param-name="applicationId" from-field="applicationId"/>
+ <parameter param-name="&amp;partyId" from-field="partyId"/>
+ <parameter param-name="&amp;referredByPartyId" from-field="referredByPartyId"/>
+ </hyperlink>
         </field>
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=759495&r1=759494&r2=759495&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sat Mar 28 16:14:58 2009
@@ -256,7 +256,11 @@
         <field name="fromDate"><display/></field>
         <field name="thruDate"><date-time/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deletePayrollPreference?partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;payrollPreferenceSeqId=${payrollPreferenceSeqId}" description="${uiLabelMap.CommonDelete}" also-hidden="true"/>
+            <hyperlink target="deletePayrollPreference" description="${uiLabelMap.CommonDelete}" also-hidden="true">
+ <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+ <parameter param-name="payrollPreferenceSeqId" from-field="payrollPreferenceSeqId"/>
+ </hyperlink>
         </field>
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml?rev=759495&r1=759494&r2=759495&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml Sat Mar 28 16:14:58 2009
@@ -112,7 +112,11 @@
             </display-entity>-->
         </field>
         <field name="editLink" title="&amp;nbsp;" widget-style="buttontext">
-            <hyperlink target="EditMarketingCampaignRoles?marketingCampaignId=${marketingCampaignId}&amp;roleTypeId=${roleTypeId}&amp;partyId=${partyId}" description="${uiLabelMap.CommonEdit}" also-hidden="false"/>
+            <hyperlink target="EditMarketingCampaignRoles" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <parameter param-name="marketingCampaignId" from-field="marketingCampaignId"/>
+ <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+ <parameter param-name="partyId" from-field="partyId"/>
+ </hyperlink>
         </field>
         <field name="deleteLink" title="&amp;nbsp;" widget-style="buttontext">
             <hyperlink target="removeMarketingCampaignRole?marketingCampaignId=${marketingCampaignId}&amp;roleTypeId=${roleTypeId}&amp;partyId=${partyId}"

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml?rev=759495&r1=759494&r2=759495&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderForms.xml Sat Mar 28 16:14:58 2009
@@ -101,7 +101,11 @@
         <field name="orderItemSeqId"><display/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="removeOrderTerm?orderId=${orderId}&amp;termTypeId=${termTypeId}&amp;orderItemSeqId=${orderItemSeqId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
+            <hyperlink target="removeOrderTerm" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <parameter param-name="orderId" from-field="orderId"/>
+ <parameter param-name="termTypeId" from-field="termTypeId"/>
+ <parameter param-name="orderItemSeqId" from-field="orderItemSeqId"/>
+ </hyperlink>
         </field>
     </form>
     <form name="AddOrderTerm" type="single" target="createOrderTerm" title=""

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml?rev=759495&r1=759494&r2=759495&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml Sat Mar 28 16:14:58 2009
@@ -159,7 +159,11 @@
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}"><display-entity also-hidden="false" entity-name="RoleType"/></field>
         <field name="quoteId"><hidden/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="removeQuoteRole?partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;quoteId=${quoteId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
+            <hyperlink target="removeQuoteRole" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+ <parameter param-name="quoteId" from-field="quoteId"/>
+ </hyperlink>
         </field>
     </form>
     <form name="EditQuoteRole" type="single" target="createQuoteRole" title="" default-map-name="quoteRole"

Modified: ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml?rev=759495&r1=759494&r2=759495&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/shipping/ShippingForms.xml Sat Mar 28 16:14:58 2009
@@ -69,10 +69,18 @@
         <field name="shipmentMethodTypeId"><display-entity also-hidden="false" entity-name="ShipmentMethodType"/></field>
         <field name="roleTypeId"><display-entity also-hidden="false" entity-name="RoleType"/></field>
         <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="ListCarrierShipmentMethods?shipmentMethodTypeId=${shipmentMethodTypeId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonEdit}" also-hidden="false"/>
+            <hyperlink target="ListCarrierShipmentMethods" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <parameter param-name="shipmentMethodTypeId" from-field="shipmentMethodTypeId"/>
+ <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+ </hyperlink>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="deleteCarrierShipmentMethod?shipmentMethodTypeId=${shipmentMethodTypeId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
+            <hyperlink target="deleteCarrierShipmentMethod" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+ <parameter param-name="shipmentMethodTypeId" from-field="shipmentMethodTypeId"/>
+ <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+ </hyperlink>
         </field>
     </form>
     <form name="EditCarrierShipmentMethod" type="single" target="createCarrierShipmentMethod" title="" default-map-name="carrierShipmentMethod"

Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=759495&r1=759494&r2=759495&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Sat Mar 28 16:14:58 2009
@@ -1000,13 +1000,21 @@
         <field name="paymentPropertiesPath" title="${uiLabelMap.ProductPaymentProps}"><display/></field>
         <field name="applyToAllProducts" title="${uiLabelMap.ProductApplyToAll}"><display/></field>
         <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:security.hasEntityPermission(&quot;CATALOG&quot;, &quot;_UPDATE&quot;, session);}" widget-style="buttontext">
-            <hyperlink target="EditProductStorePaySetup?productStoreId=${productStoreId}&amp;paymentMethodTypeId=${paymentMethodTypeId}&amp;paymentServiceTypeEnumId=${paymentServiceTypeEnumId}" description="${uiLabelMap.CommonEdit}" also-hidden="false"/>
+            <hyperlink target="EditProductStorePaySetup" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+ <parameter param-name="productStoreId" from-field="productStoreId"/>
+ <parameter param-name="paymentMethodTypeId" from-field="paymentMethodTypeId"/>
+ <parameter param-name="paymentServiceTypeEnumId" from-field="paymentServiceTypeEnumId"/>
+ </hyperlink>
         </field>
         <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:!security.hasEntityPermission(&quot;CATALOG&quot;, &quot;_UPDATE&quot;, session);}">
             <display/>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:security.hasEntityPermission(&quot;CATALOG&quot;, &quot;_DELETE&quot;, session);}" widget-style="buttontext">
-            <hyperlink target="storeRemovePaySetting?productStoreId=${productStoreId}&amp;paymentMethodTypeId=${paymentMethodTypeId}&amp;paymentServiceTypeEnumId=${paymentServiceTypeEnumId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+            <hyperlink target="storeRemovePaySetting" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+ <parameter param-name="productStoreId" from-field="productStoreId"/>
+ <parameter param-name="paymentMethodTypeId" from-field="paymentMethodTypeId"/>
+ <parameter param-name="paymentServiceTypeEnumId" from-field="paymentServiceTypeEnumId"/>
+ </hyperlink>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" use-when="${bsh:!security.hasEntityPermission(&quot;CATALOG&quot;, &quot;_DELETE&quot;, session);}">
             <display/>