svn commit: r759565 - in /ofbiz/trunk: applications/accounting/webapp/accounting/invoice/ applications/accounting/webapp/accounting/payment/ applications/content/widget/forum/ applications/order/webapp/ordermgr/request/ applications/party/webapp/partym...

Author: jleroux
Date: Sat Mar 28 20:01:04 2009
New Revision: 759565

URL: http://svn.apache.org/viewvc?rev=759565&view=rev
Log:
14th 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/invoice/InvoiceForms.xml
    ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
    ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=759565&r1=759564&r2=759565&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Sat Mar 28 20:01:04 2009
@@ -301,7 +301,12 @@
                return(NumberFormat.getNumberInstance(context.get("locale")).format(quantity.multiply(amount)));}"/>
        </row-actions>
        <field name="invoiceId"><hidden/></field>
-       <field name="invoiceItemSeqId" widget-style="buttontext"><hyperlink target="listInvoiceItems?invoiceId=${invoiceId}&amp;invoiceItemSeqId=${invoiceItemSeqId}" description="${invoiceItemSeqId}"/></field>
+       <field name="invoiceItemSeqId" widget-style="buttontext">
+ <hyperlink target="listInvoiceItems">
+ <parameter param-name="invoiceId" from-field="invoiceId"/>
+ <parameter param-name="invoiceItemSeqId" from-field="invoiceItemSeqId}" description="${invoiceItemSeqId"/>
+ </hyperlink>
+ </field>
        <field name="quantity"><text size="3"/></field>
        <field name="invoiceItemTypeId">
            <drop-down allow-empty="false">

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=759565&r1=759564&r2=759565&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Sat Mar 28 20:01:04 2009
@@ -414,7 +414,12 @@
         <field name="paymentApplicationId"><hidden/></field>
         <field name="paymentId"><hidden/></field>
         <field name="invoiceId" widget-style="buttontext"><hyperlink target="invoiceOverview?invoiceId=${invoiceId}" description="${invoiceId}"/></field>
-        <field name="invoiceItemSeqId" widget-style="buttontext"><hyperlink target="listInvoiceItems?invoiceId=${invoiceId}&amp;invoiceItemSeqId=${invoiceItemSeqId}" description="${invoiceItemSeqId}"/></field>
+        <field name="invoiceItemSeqId" widget-style="buttontext">
+ <hyperlink target="listInvoiceItems">
+ <parameter param-name="invoiceId" from-field="invoiceId"/>
+ <parameter param-name="invoiceItemSeqId" from-field="invoiceItemSeqId}" description="${invoiceItemSeqId"/>
+ </hyperlink>
+ </field>
         <field name="toPaymentId" widget-style="buttontext"><hyperlink target="paymentOverview?paymentId=${toPaymentId}" description="${toPaymentId}"/></field>
         <field name="billingAccountId" widget-style="buttontext"><hyperlink target="EditBillingAccount?billingAccountId=${billingAccountId}" description="${billingAccountId}"/></field>
         <field name="taxAuthGeoId"><display-entity entity-name="Geo" key-field-name="geoId" description="${geoName}"></display-entity></field>

Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=759565&r1=759564&r2=759565&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Sat Mar 28 20:01:04 2009
@@ -41,7 +41,12 @@
         <field name="contentIdTo"><hidden value="${caContentIdTo}"/></field>
         <field name="contentAssocTypeId"><hidden value="${caContentAssocTypeId}"/></field>
         <field name="contentTypeId"><hidden/></field>
-        <field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId"><hyperlink target="findForumMessages?forumGroupId=${parameters.forumGroupId}&amp;forumId=${contentId}" description="${uiLabelMap.ContentForumMessages}"/></field>
+        <field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId">
+ <hyperlink target="findForumMessages">
+ <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
+ <parameter param-name="forumId" from-field="contentId}" description="${uiLabelMap.ContentForumMessages"/>
+ </hyperlink>
+ </field>
         <field name="forumName" entry-name="contentName" parameter-name="contentName"><text/></field>
         <field name="forumDescription" entry-name="description" parameter-name="description"><text/></field>
         <field name="thruDate" entry-name="caThruDate"><date-time/></field>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=759565&r1=759564&r2=759565&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Sat Mar 28 20:01:04 2009
@@ -114,7 +114,12 @@
         <field name="statusId">
             <display-entity also-hidden="false" entity-name="StatusItem"/>
         </field>
-        <field name="addNote"><hyperlink description="${uiLabelMap.FormFieldTitle_addNote}" target="requestitemnotes?custRequestId=${custRequestId}&amp;custRequestItemSeqId=${custRequestItemSeqId}"/></field>
+        <field name="addNote">
+ <hyperlink description="${uiLabelMap.FormFieldTitle_addNote}" target="requestitemnotes">
+ <parameter param-name="custRequestId" from-field="custRequestId"/>
+ <parameter param-name="custRequestItemSeqId" from-field="custRequestItemSeqId"/>
+ </hyperlink>
+ </field>
     </form>
     <form name="OverviewRequestItems" extends="ListRequestItems">
         <field name="priority"><ignored/></field>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=759565&r1=759564&r2=759565&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Sat Mar 28 20:01:04 2009
@@ -901,7 +901,12 @@
         <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display/></field>
         <field name="description" title="${uiLabelMap.PartyRole}"><display/></field>
         <field name="parentTypeId"><display-entity entity-name="RoleType" key-field-name="roleTypeId" description="${description}"/></field>
-        <field name="remove"><hyperlink target="deleterole?partyId=${partyId}&amp;roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonRemove}"/></field>
+        <field name="remove">
+ <hyperlink target="deleterole">
+ <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="roleTypeId" from-field="roleTypeId}" description="${uiLabelMap.CommonRemove"/>
+ </hyperlink>
+ </field>
     </form>
     <form name="AddPartyRole" type="single" title="Add a role to party" target="addrole/viewroles">
         <field name="partyId"><hidden value="${parameters.partyId}"/></field>

Modified: ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml?rev=759565&r1=759564&r2=759565&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml Sat Mar 28 20:01:04 2009
@@ -203,10 +203,20 @@
         default-table-style="basic-table" odd-row-style="alternate-row" paginate-target="FindProductConfigItems"
         target="" header-row-style="header-row-2" paginate="true">
         <auto-fields-entity entity-name="ProductConfigOption" default-field-type="display" />
-        <field name="configItemId" widget-style="buttontext" title="${uiLabelMap.ProductConfigItem}"><hyperlink target="EditProductConfigOptions?configItemId=${configItemId}&amp;configOptionId=${configOptionId}" description="${configOptionId} - ${configOptionName}"/></field>
+        <field name="configItemId" widget-style="buttontext" title="${uiLabelMap.ProductConfigItem}">
+ <hyperlink target="EditProductConfigOptions">
+ <parameter param-name="configItemId" from-field="configItemId"/>
+ <parameter param-name="configOptionId" from-field="configOptionId}" description="${configOptionId} - ${configOptionName"/>
+ </hyperlink>
+ </field>
         <field name="configOptionId" ><hidden/></field>
         <field name="configOptionName" ><hidden/></field>
-        <field name="remove" title="${uiLabelMap.CommonRemove}" widget-style="buttontext" ><hyperlink target="deleteProductConfigOption?configItemId=${configItemId}&amp;configOptionId=${configOptionId}" description="${uiLabelMap.CommonRemove}"/></field>
+        <field name="remove" title="${uiLabelMap.CommonRemove}" widget-style="buttontext" >
+ <hyperlink target="deleteProductConfigOption">
+ <parameter param-name="configItemId" from-field="configItemId"/>
+ <parameter param-name="configOptionId" from-field="configOptionId}" description="${uiLabelMap.CommonRemove"/>
+ </hyperlink>
+ </field>
     </form>
     
     <form name="ProductConfigList" type="list" list-name="configProducts"

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml?rev=759565&r1=759564&r2=759565&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml Sat Mar 28 20:01:04 2009
@@ -37,7 +37,12 @@
         <field name="contactMechTypeId"><display-entity entity-name="ContactMechType"/></field>
         <field name="description"><text size="40"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="deleteCommunicationEventWorkEff?workEffortId=${workEffortId}&amp;communicationEventId=${communicationEventId}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+ <hyperlink target="deleteCommunicationEventWorkEff">
+ <parameter param-name="workEffortId" from-field="workEffortId"/>
+ <parameter param-name="communicationEventId" from-field="communicationEventId}" also-hidden="false" description="${uiLabelMap.CommonDelete"/>
+ </hyperlink>
+ </field>
     </form>
     <form name="AddWorkEffortCommEvent" default-map-name="communicationEvent" target="createWorkEffortCommEvent" title="" type="single" extends="EditCommEvent"
         extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" header-row-style="header-row" default-table-style="basic-table">

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml?rev=759565&r1=759564&r2=759565&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml Sat Mar 28 20:01:04 2009
@@ -39,7 +39,12 @@
         <field name="orderTypeDescription"><display/></field>
         <field name="orderDate"><display/></field>
         <field name="grandTotal"><display/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="deleteWorkEffortOrderHeader?workEffortId=${workEffortId}&amp;orderId=${orderId}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+ <hyperlink target="deleteWorkEffortOrderHeader">
+ <parameter param-name="workEffortId" from-field="workEffortId"/>
+ <parameter param-name="orderId" from-field="orderId}" also-hidden="false" description="${uiLabelMap.CommonDelete"/>
+ </hyperlink>
+ </field>
     </form>
     <form name="AddWorkEffortOrderHeader" target="createWorkEffortOrderHeader" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml?rev=759565&r1=759564&r2=759565&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml Sat Mar 28 20:01:04 2009
@@ -35,7 +35,12 @@
         <field name="workReqFulfTypeDescription"><display/></field>
         <field name="statusItemDescription"><display/></field>
         <field name="requirementDescription"><display/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="deleteWorkEffortRequirement?workEffortId=${workEffortId}&amp;requirementId=${requirementId}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+ <hyperlink target="deleteWorkEffortRequirement">
+ <parameter param-name="workEffortId" from-field="workEffortId"/>
+ <parameter param-name="requirementId" from-field="requirementId}" also-hidden="false" description="${uiLabelMap.CommonDelete"/>
+ </hyperlink>
+ </field>
     </form>
     <form name="AddWorkEffortRequirement" default-map-name="workRequirementFulfillment" target="createWorkEffortRequirement" title="" type="single" extends="EditRequirement"
         extends-resource="component://order/webapp/ordermgr/requirement/RequirementForms.xml" header-row-style="header-row" default-table-style="basic-table">

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml?rev=759565&r1=759564&r2=759565&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortShopListForms.xml Sat Mar 28 20:01:04 2009
@@ -35,7 +35,12 @@
         <field name="listName"><display/></field>
         <field name="description"><display/></field>
         <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName} [${partyId}]"/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="deleteShoppingListWorkEffort?workEffortId=${workEffortId}&amp;shoppingListId=${shoppingListId}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
+ <hyperlink target="deleteShoppingListWorkEffort">
+ <parameter param-name="workEffortId" from-field="workEffortId"/>
+ <parameter param-name="shoppingListId" from-field="shoppingListId}" also-hidden="false" description="${uiLabelMap.CommonDelete"/>
+ </hyperlink>
+ </field>
     </form>
     <form name="AddWorkEffortShopList" target="createShoppingListWorkEffort" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=759565&r1=759564&r2=759565&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Sat Mar 28 20:01:04 2009
@@ -46,7 +46,12 @@
         <field use-when="telResult.get(&quot;extension&quot;)!=null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber} Ext:${telResult.extension}"/></field>
         <field use-when="telResult.get(&quot;extension&quot;)==null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}"/></field>
         <field name="contactMechPurposeTypeId" entry-name="telResult.contactMechPurposeTypeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="ContactMechPurposeType"/></field>
-        <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="removeResource?partyId=${partyId}&amp;roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonRemove}"/></field>
+        <field name="remove" title="${uiLabelMap.CommonRemove}">
+ <hyperlink target="removeResource">
+ <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="roleTypeId" from-field="roleTypeId}" description="${uiLabelMap.CommonRemove"/>
+ </hyperlink>
+ </field>
     </form>                                        
     <form name="ListBillingHours" type="list" list-name="billingList" paginate-target="ListResourcesBillingHours"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">