svn commit: r759481 - in /ofbiz/trunk: applications/accounting/webapp/accounting/agreement/ applications/content/webapp/content/layout/ applications/content/widget/compdoc/ applications/content/widget/content/ applications/humanres/widget/forms/ applic...

Author: jleroux
Date: Sat Mar 28 15:12:54 2009
New Revision: 759481

URL: http://svn.apache.org/viewvc?rev=759481&view=rev
Log:
6th 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/webapp/content/layout/LayoutForms.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
    ofbiz/trunk/applications/content/widget/content/ContentForms.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.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=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Sat Mar 28 15:12:54 2009
@@ -406,7 +406,12 @@
         <field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
         <field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
         <field name="productPromoId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${productPromoId}" target="EditAgreementPromoAppl?productPromoId=${productPromoId}&amp;agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}&amp;fromDate=${fromDate}"/>
+            <hyperlink also-hidden="false" description="${productPromoId}" target="EditAgreementPromoAppl">
+                <parameter param-name="productPromoId" from-field="productPromoId"/>
+                <parameter param-name="agreementId" from-field="agreementId"/>
+                <parameter param-name="agreementItemSeqId" from-field="agreementItemSeqId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
         <field name="productPromoName" entry-name="productPromoId">
             <display-entity entity-name="ProductPromo" key-field-name="productPromoId" description="${promoName}"/>

Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Sat Mar 28 15:12:54 2009
@@ -173,7 +173,12 @@
         <field name="drObjectInfo"><display/></field>
         <!--
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout?contentId=${contentId}&amp;contentIdTo=${contentIdTo}&amp;contentAssocTypeId=${contentAssocTypeId}&amp;fromDate=${fromDate}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="contentIdTo" from-field="contentIdTo"/>
+                <parameter param-name="contentAssocTypeId" from-field="contentAssocTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
         -->
     </form>
@@ -187,7 +192,12 @@
         <field name="description"><display/></field>
         <field name="drObjectInfo"><display/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout?contentId=${contentId}&amp;contentIdTo=${caContentIdTo}&amp;contentAssocTypeId=${caContentAssocTypeId}&amp;fromDate=${caFromDate}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeLayout">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="contentIdTo" from-field="caContentIdTo"/>
+                <parameter param-name="contentAssocTypeId" from-field="caContentAssocTypeId"/>
+                <parameter param-name="fromDate" from-field="caFromDate"/>
+            </hyperlink>
         </field>
     </form>
 

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Sat Mar 28 15:12:54 2009
@@ -50,16 +50,36 @@
         <field name="contentTypeId"><display/></field>
         <field name="contentName"><display/></field>
         <field name="edit" use-when="&quot;COMPDOC_TEMPLATE&quot;.equals(contentTypeId)" widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc?contentId=${contentId}&amp;rootContentId=${caContentIdTo}&amp;caContentAssocTypeId=${caContentAssocTypeId}&amp;caFromDate=${caFromDate}"/>
+           <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="rootContentId" from-field="caContentIdTo"/>
+                <parameter param-name="caContentAssocTypeId" from-field="caContentAssocTypeId"/>
+                <parameter param-name="caFromDate" from-field="caFromDate"/>
+            </hyperlink>
         </field>
         <field name="edit" use-when="&quot;COMPDOC_INSTANCE&quot;.equals(contentTypeId)" widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc?contentId=${contentId}&amp;rootContentId=${caContentIdTo}&amp;caContentAssocTypeId=${caContentAssocTypeId}&amp;caFromDate=${caFromDate}"/>
+           <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="rootContentId" from-field="caContentIdTo"/>
+                <parameter param-name="caContentAssocTypeId" from-field="caContentAssocTypeId"/>
+                <parameter param-name="caFromDate" from-field="caFromDate"/>
+            </hyperlink>
         </field>
         <field name="edit" use-when="&quot;TEMPLATE&quot;.equals(contentTypeId)" widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc?contentId=${contentId}&amp;rootContentId=${caContentIdTo}&amp;caContentAssocTypeId=${caContentAssocTypeId}&amp;caFromDate=${caFromDate}"/>
+           <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="rootContentId" from-field="caContentIdTo"/>
+                <parameter param-name="caContentAssocTypeId" from-field="caContentAssocTypeId"/>
+                <parameter param-name="caFromDate" from-field="caFromDate"/>
+            </hyperlink>
         </field>
         <field name="edit" use-when="&quot;DOCUMENT&quot;.equals(contentTypeId)" widget-style="buttontext">
-           <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc?contentId=${contentId}&amp;rootContentId=${caContentIdTo}&amp;caContentAssocTypeId=${caContentAssocTypeId}&amp;caFromDate=${caFromDate}"/>
+           <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="rootContentId" from-field="caContentIdTo"/>
+                <parameter param-name="caContentAssocTypeId" from-field="caContentAssocTypeId"/>
+                <parameter param-name="caFromDate" from-field="caFromDate"/>
+            </hyperlink>
         </field>
         <field name="tree" use-when="&quot;COMPDOC_TEMPLATE&quot;.equals(contentTypeId)" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocTemplateTree?rootContentId=${contentId}"/>
@@ -113,13 +133,28 @@
         <field name="committedByPartyId"><display/></field>
         <field name="comments"><display/></field>
         <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevision?contentId=${contentId}&amp;contentRevisionSeqId=${contentRevisionSeqId}&amp;rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevision">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
+                <parameter param-name="rootContentId" from-field="rootContentId"/>
+                <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+            </hyperlink>
         </field>
         <field name="itemLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonItems}" target="ListContentRevisionItem?contentId=${contentId}&amp;contentRevisionSeqId=${contentRevisionSeqId}&amp;rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonItems}" target="ListContentRevisionItem">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
+                <parameter param-name="rootContentId" from-field="rootContentId"/>
+                <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+            </hyperlink>
         </field>
         <field name="create" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreate}" target="EditContentRevision?contentId=${contentId}&amp;contentRevisionSeqId=${contentRevisionSeqId}&amp;rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreate}" target="EditContentRevision">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
+                <parameter param-name="rootContentId" from-field="rootContentId"/>
+                <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+            </hyperlink>
         </field>
         <field name="tree" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="&quot;COMPDOC_INSTANCE&quot;.equals(contentTypeId)">
             <hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree?rootContentId=${contentId}&amp;rootContentRevisionSeqId=${contentRevisionSeqId}"/>
@@ -162,7 +197,12 @@
             </hyperlink>
         </field>
         <field name="create" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreate}" target="EditContentRevisionItem?contentId=${contentId}&amp;contentRevisionSeqId=${contentRevisionSeqId}&amp;rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreate}" target="EditContentRevisionItem">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
+                <parameter param-name="rootContentId" from-field="rootContentId"/>
+                <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+            </hyperlink>
         </field>
     </form>
 

Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Sat Mar 28 15:12:54 2009
@@ -276,7 +276,12 @@
         <field name="mapKey"><display/></field>
         <field name="fromDate"><display description="${bsh:fromDate.toString().substring(0,10)}"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc?contentId=${contentId}&amp;contentIdTo=${contentIdTo}&amp;contentAssocTypeId=${contentAssocTypeId}&amp;fromDate=${fromDate}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="contentIdTo" from-field="contentIdTo"/>
+                <parameter param-name="contentAssocTypeId" from-field="contentAssocTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
         <field name="thruDate"><date-time/></field>
         <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext">
@@ -300,7 +305,12 @@
         <field name="mapKey"><display/></field>
         <field name="fromDate"><display description="${bsh:fromDate.toString().substring(0,10)}"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc?contentId=${contentId}&amp;contentIdTo=${contentIdTo}&amp;contentAssocTypeId=${contentAssocTypeId}&amp;fromDate=${fromDate}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="contentIdTo" from-field="contentIdTo"/>
+                <parameter param-name="contentAssocTypeId" from-field="contentAssocTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
         <field name="thruDate"><date-time/></field>
         <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext">
@@ -346,7 +356,12 @@
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="remove${contentRoleTarget}ContentRole?contentId=${contentId}&amp;roleTypeId=${roleTypeId}&amp;partyId=${partyId}&amp;fromDate=${fromDate}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="remove${contentRoleTarget}ContentRole">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+                <parameter param-name="partyId" from-field="partyId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
     </form>
     
@@ -490,7 +505,12 @@
         <field name="fromDate" widget-style="tabletext"><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 also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent?workEffortContentTypeId=${workEffortContentTypeId}&amp;fromDate=${fromDate}&amp;workEffortId=${workEffortId}&amp;contentId=${contentId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent">
+                <parameter param-name="workEffortContentTypeId" from-field="workEffortContentTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+                <parameter param-name="contentId" from-field="contentId"/>
+            </hyperlink>
         </field>
     </form>
     <form name="ListDocument"  target="" type="list"  list-name="contentAssoc" paginate-target="navigateContent"

Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Sat Mar 28 15:12:54 2009
@@ -370,7 +370,12 @@
         <field name="thruDate" widget-style="buttontext"><date-time/></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 also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceRole?dataResourceId=${dataResourceId}&amp;roleTypeId=${roleTypeId}&amp;partyId=${partyId}&amp;fromDate=${fromDate}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeDataResourceRole">
+                <parameter param-name="dataResourceId" from-field="dataResourceId"/>
+                <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+                <parameter param-name="partyId" from-field="partyId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
     </form>
 

Modified: ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml Sat Mar 28 15:12:54 2009
@@ -76,7 +76,12 @@
         </actions>
         <auto-fields-service default-field-type="display" service-name="updatePerfReviewItem"/>        
         <field name="perfReviewItemSeqId" widget-style="linktext">
-            <hyperlink also-hidden="false" description="${perfReviewItemSeqId}" target="EditPerfReviewItem?perfReviewItemSeqId=${perfReviewItemSeqId}&amp;employeePartyId=${employeePartyId}&amp;employeeRoleTypeId=${employeeRoleTypeId}&amp;perfReviewId=${perfReviewId}"/>
+            <hyperlink also-hidden="false" description="${perfReviewItemSeqId}" target="EditPerfReviewItem">
+                <parameter param-name="perfReviewItemSeqId" from-field="perfReviewItemSeqId"/>
+                <parameter param-name="employeePartyId" from-field="employeePartyId"/>
+                <parameter param-name="employeeRoleTypeId" from-field="employeeRoleTypeId"/>
+                <parameter param-name="perfReviewId" from-field="perfReviewId"/>
+            </hyperlink>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
             <hyperlink target="deletePerfReviewItem" description="${uiLabelMap.CommonDelete}" also-hidden="false">

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Sat Mar 28 15:12:54 2009
@@ -557,14 +557,14 @@
         <response name="success" type="request" value="orderentry"/>
         <response name="error" type="request" value="orderentry"/>
     </request-map>
-
+    
     <request-map uri="bulkAddProductsInApprovedOrder">
         <security https="true" auth="true"/>
         <event type="java" path="org.ofbiz.order.shoppingcart.ShoppingCartEvents" invoke="bulkAddProductsInApprovedOrder"/>
         <response name="success" type="request-redirect"  value="orderview"><redirect-parameter name="orderId"/></response>  
         <response name="error" type="request" value="orderview"/>
-    </request-map>
-
+    </request-map>    
+    
     <request-map uri="category">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="category"/>
@@ -1470,7 +1470,7 @@
     <request-map uri="LookupCustomerName"><security auth="true" https="true"/><response name="success" type="view" value="LookupCustomerName"/></request-map>
     <request-map uri="LookupProduct"><security https="true" auth="true"/><response name="success" type="view" value="LookupProduct"/></request-map>
     <request-map uri="LookupSupplierProduct"><security https="true" auth="true"/><response name="success" type="view" value="LookupSupplierProduct"/></request-map>
-    <request-map uri="LookupBulkAddSupplierProductsInApprovedOrder"><security https="true" auth="true"/><response name="success" type="view" value="LookupBulkAddSupplierProductsInApprovedOrder"/></request-map>
+    <request-map uri="LookupBulkAddSupplierProductsInApprovedOrder"><security https="true" auth="true"/><response name="success" type="view" value="LookupBulkAddSupplierProductsInApprovedOrder"/></request-map>    
     <request-map uri="LookupProductAndPrice"><security https="true" auth="true"/><response name="success" type="view" value="LookupProductAndPrice"/></request-map>
     <request-map uri="LookupProductFeature"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductFeature"/></request-map>
     <request-map uri="LookupUserLoginAndPartyDetails"><security https="true" auth="true"/><response name="success" type="view" value="LookupUserLoginAndPartyDetails"/></request-map>
@@ -1651,7 +1651,7 @@
     <view-map name="LookupCustomerName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupCustomerName"/>
     <view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/>
     <view-map name="LookupSupplierProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupSupplierProduct"/>
-    <view-map name="LookupBulkAddSupplierProductsInApprovedOrder" type="screen" page="component://order/widget/ordermgr/OrderEntryOrderScreens.xml#LookupBulkAddSupplierProductsInApprovedOrder"/>
+    <view-map name="LookupBulkAddSupplierProductsInApprovedOrder" type="screen" page="component://order/widget/ordermgr/OrderEntryOrderScreens.xml#LookupBulkAddSupplierProductsInApprovedOrder"/>    
     <view-map name="LookupProductAndPrice" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductAndPrice"/>
     <view-map name="LookupProductFeature" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature"/>
     <view-map name="LookupUserLoginAndPartyDetails" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupUserLoginAndPartyDetails"/>    

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=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Sat Mar 28 15:12:54 2009
@@ -130,7 +130,12 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="RequestItemQuotes">
         <auto-fields-entity entity-name="QuoteItem" default-field-type="display"/>
         <field name="quoteId" widget-style="buttontext">
-            <hyperlink description="${quoteItemSeqId}" target="EditQuoteItemForRequest?custRequestId=${custRequestId}&amp;custRequestItemSeqId=${custRequestItemSeqId}&amp;quoteId=${quoteId}&amp;quoteItemSeqId=${quoteItemSeqId}"/>
+            <hyperlink description="${quoteItemSeqId}" target="EditQuoteItemForRequest">
+                <parameter param-name="custRequestId" from-field="custRequestId"/>
+                <parameter param-name="custRequestItemSeqId" from-field="custRequestItemSeqId"/>
+                <parameter param-name="quoteId" from-field="quoteId"/>
+                <parameter param-name="quoteItemSeqId" from-field="quoteItemSeqId"/>
+            </hyperlink>
         </field>
         <field name="productId" title="${uiLabelMap.ProductProductId}">
             <display-entity entity-name="Product" key-field-name="productId" description="${productId} - ${internalName}"/>
@@ -396,7 +401,12 @@
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>        
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteCustRequestParty?custRequestId=${custRequestId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}"/>
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="deleteCustRequestParty">
+                <parameter param-name="custRequestId" from-field="custRequestId"/>
+                <parameter param-name="partyId" from-field="partyId"/>
+                <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>    
     </form>
 

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml Sat Mar 28 15:12:54 2009
@@ -158,10 +158,20 @@
         <auto-fields-entity entity-name="RequirementRole" default-field-type="display"/>
         <field name="requirementId"><hidden/></field>
         <field name="editLink" widget-style="buttontext" title="${uiLabelMap.CommonEdit}">
-            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditRequirementRole?requirementId=${requirementId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}"/>
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditRequirementRole">
+                <parameter param-name="requirementId" from-field="requirementId"/>
+                <parameter param-name="partyId" from-field="partyId"/>
+                <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
         <field name="removeLink" widget-style="buttontext" title="${uiLabelMap.CommonRemove}">
-            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeRequirementRole?requirementId=${requirementId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}"/>
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeRequirementRole">
+                <parameter param-name="requirementId" from-field="requirementId"/>
+                <parameter param-name="partyId" from-field="partyId"/>
+                <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
     </form>
     <form name="EditRequirementRole" type="single" target="updateRequirementRole" title="" default-map-name="requirementRole"

Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sat Mar 28 15:12:54 2009
@@ -333,7 +333,12 @@
         <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
         <field name="removeButton" widget-style="smallSubmit"><submit/></field>
         <field name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
-            <hyperlink description="${subject} " target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;my=${my}"/>
+            <hyperlink description="${subject} " target="ViewCommunicationEvent">
+                <parameter param-name="communicationEventId" from-field="communicationEventId"/>
+                <parameter param-name="partyId" from-field="partyId"/>
+                <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+                <parameter param-name="my" from-field="my"/>
+            </hyperlink>
         </field>
         <field name="statusId" entry-name="roleStatusId" widget-style="buttontext" widget-area-style="fieldWidth300">
             <display-entity entity-name="StatusItem" description="${description}">
@@ -506,7 +511,12 @@
             </entity-and>
         </actions>
         <field name="contentName" widget-style="smallSubmit">
-            <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="ViewSimpleContent?contentId=${contentId}&amp;dataResourceId=${dataResourceId}&amp;communicationEventId=${communicationEventId}&amp;fromDate=${fromDate}"/>
+            <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="ViewSimpleContent">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="dataResourceId" from-field="dataResourceId"/>
+                <parameter param-name="communicationEventId" from-field="communicationEventId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
         <field name="contentTypeId"><display-entity entity-name="ContentType" description="${description}"/></field>
         <field name="fromDate"><display/></field>

Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Sat Mar 28 15:12:54 2009
@@ -930,10 +930,20 @@
         <!-- <display-entity entity-name="FixedAsset" description="${fixedAssetName}[${fixedAssetId}]"/> -->
 
         <field name="edit" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonEdit}" target="showFixedAssetProduct?fixedAssetId=${fixedAssetId}&amp;productId=${productId}&amp;fixedAssetProductTypeId=${fixedAssetProductTypeId}&amp;fromDate=${fromDate}"/>
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="showFixedAssetProduct">
+                <parameter param-name="fixedAssetId" from-field="fixedAssetId"/>
+                <parameter param-name="productId" from-field="productId"/>
+                <parameter param-name="fixedAssetProductTypeId" from-field="fixedAssetProductTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
         <field name="del" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" separate-column="false">
-            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFixedAssetProduct?fixedAssetId=${fixedAssetId}&amp;productId=${productId}&amp;fixedAssetProductTypeId=${fixedAssetProductTypeId}&amp;fromDate=${fromDate}"/>
+            <hyperlink description="${uiLabelMap.CommonDelete}" target="removeFixedAssetProduct">
+                <parameter param-name="fixedAssetId" from-field="fixedAssetId"/>
+                <parameter param-name="productId" from-field="productId"/>
+                <parameter param-name="fixedAssetProductTypeId" from-field="fixedAssetProductTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
         <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAsset} [${uiLabelMap.AccountingFixedAssetId}]" widget-style="buttontext" >
             <display-entity entity-name="FixedAsset" description="${fixedAssetName} [${fixedAssetId}]"/>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sat Mar 28 15:12:54 2009
@@ -922,7 +922,12 @@
         <field name="fromDate"><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 also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent?workEffortContentTypeId=${workEffortContentTypeId}&amp;fromDate=${fromDate}&amp;workEffortId=${workEffortId}&amp;contentId=${contentId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortContent">
+                <parameter param-name="workEffortContentTypeId" from-field="workEffortContentTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+                <parameter param-name="contentId" from-field="contentId"/>
+            </hyperlink>
         </field>
     </form>
 
@@ -977,7 +982,12 @@
         </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 also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffortGoodStandard?workEffortGoodStdTypeId=${workEffortGoodStdTypeId}&amp;productId=${productId}&amp;fromDate=${fromDate}&amp;workEffortId=${workEffortId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffortGoodStandard">
+                <parameter param-name="workEffortGoodStdTypeId" from-field="workEffortGoodStdTypeId"/>
+                <parameter param-name="productId" from-field="productId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+            </hyperlink>
         </field>
     </form>
     

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Sat Mar 28 15:12:54 2009
@@ -163,7 +163,12 @@
             </entity-condition>
         </actions>
         <field name="workEffortName" entry-name="workEffortToName" title="${uiLabelMap.CommonName}">
-            <hyperlink also-hidden="false" description="${workEffortToName}" target="EditWorkEfforts?workEffortId=${workEffortIdTo}&amp;workEffortIdFrom=${workEffortId}&amp;fromDate=${fromDate}&amp;workEffortAssocTypeId=${workEffortAssocTypeId}"/>
+            <hyperlink also-hidden="false" description="${workEffortToName}" target="EditWorkEfforts">
+                <parameter param-name="workEffortId" from-field="workEffortIdTo"/>
+                <parameter param-name="workEffortIdFrom" from-field="workEffortId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="workEffortAssocTypeId" from-field="workEffortAssocTypeId"/>
+            </hyperlink>
         </field>
         <field name="workEffortAssocTypeId">
             <display-entity entity-name="WorkEffortAssocType" description="${description}"/>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Sat Mar 28 15:12:54 2009
@@ -108,10 +108,22 @@
         <field name="donePage"><hidden/></field>
         <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
         <field name="removeLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="RemoveCommunicationEventRole?partyId=${partyId}&amp;communicationEventId=${communicationEventId}&amp;roleTypeId=${roleTypeId}&amp;deleteCommEventIfLast=Y&amp;delContentDataResource=Y&amp;donePage=${parameters.donePage}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="RemoveCommunicationEventRole">
+                <parameter param-name="partyId" from-field="partyId"/>
+                <parameter param-name="communicationEventId" from-field="communicationEventId"/>
+                <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+                <parameter param-name="deleteCommEventIfLast" value="Y"/>
+                <parameter param-name="delContentDataResource value="Y"/>
+                <parameter param-name="donePage" from-field="parameters.donePage"/>
+            </hyperlink>
         </field>
         <field name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
-            <hyperlink description="${subject} " target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;donePage=${parameters.donePage}"/>
+            <hyperlink description="${subject} " target="ViewCommunicationEvent">
+                <parameter param-name="communicationEventId" from-field="communicationEventId"/>
+                <parameter param-name="partyId" from-field="partyId"/>
+                <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+                <parameter param-name="donePage" from-field="parameters.donePage"/>
+            </hyperlink>
         </field>
         <field name="statusId" entry-name="roleStatusId" widget-style="buttontext" widget-area-style="fieldWidth300">
             <display-entity entity-name="StatusItem" description="${description}">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Mar 28 15:12:54 2009
@@ -584,8 +584,24 @@
         <field name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}" widget-area-style="centered"><display type="date"/></field>
         <field name="plannedHours" widget-area-style="centered"><display/></field>
         <field name="actualHours" widget-area-style="centered"><display/></field>
-        <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateResourcesTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_ENDED" description="${uiLabelMap.CommonRemove}"/></field>
-        <field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}"><hyperlink target="updateResourcesTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED" description="${uiLabelMap.CommonStatustoComplete}"/></field>
+        <field name="remove" title="${uiLabelMap.CommonRemove}">
+        <hyperlink target="updateResourcesTaskAssigment"  description="${uiLabelMap.CommonRemove}">
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+                <parameter param-name="partyId" from-field="partyId"/>
+                <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="statusId" value="PAS_ENDED"/>
+            </hyperlink>
+        </field>
+        <field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}">
+            <hyperlink target="updateResourcesTaskAssigment" description="${uiLabelMap.CommonStatustoComplete}">
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+                <parameter param-name="partyId" from-field="partyId"/>
+                <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="statusId" value="PAS_COMPLETED"/>
+        </hyperlink>
+    </field>
     </form>
     <form name="listResourcesProjects" type="list" list-name="parties"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
@@ -712,10 +728,20 @@
         <field name="thruDate"><ignored/></field>
         <field name="submitButton"><ignored/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="headerItem.equals(&quot;EditProjectContents&quot;)">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteProjectContent?contentId=${contentId}&amp;workEffortId=${workEffortId}&amp;workEffortContentTypeId=${workEffortContentTypeId}&amp;fromDate=${fromDate}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteProjectContent">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+                <parameter param-name="workEffortContentTypeId" from-field="workEffortContentTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="headerItem.equals(&quot;EditTaskContents&quot;)">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteTaskContent?contentId=${contentId}&amp;workEffortId=${workEffortId}&amp;workEffortContentTypeId=${workEffortContentTypeId}&amp;fromDate=${fromDate}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteTaskContent">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+                <parameter param-name="workEffortContentTypeId" from-field="workEffortContentTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
     </form>
     <form name="UploadWorkEffortContent" type="upload" default-map-name="content"

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=759481&r1=759480&r2=759481&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sat Mar 28 15:12:54 2009
@@ -240,8 +240,24 @@
         <field name="workEffortId"><hidden/></field>
         <field name="fromDate"><hidden/></field>
         <field name="updateButton"><submit/></field>
-        <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_ENDED" description="${uiLabelMap.CommonRemove}"/></field>
-        <field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED" description="${uiLabelMap.CommonStatustoComplete}"/></field>
+        <field name="remove" title="${uiLabelMap.CommonRemove}">
+        <hyperlink target="updateTaskAssigment" description="${uiLabelMap.CommonRemove}">
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+                <parameter param-name="partyId" from-field="partyId"/>
+                <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="statusId" value="PAS_ENDED"/>
+            </hyperlink>
+        </field>
+        <field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}">
+            <hyperlink target="updateTaskAssigment" description="${uiLabelMap.CommonStatustoComplete">
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+                <parameter param-name="partyId" from-field="partyId"/>
+                <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="statusId" value="PAS_COMPLETED"/>
+            </hyperlink>
+        </field>
     </form>
     <form name="assignTaskToMe" type="single" target="addTaskAssignment"
         header-row-style="header-row" default-table-style="basic-table">
@@ -533,7 +549,12 @@
             </entity-and>
         </actions>
         <field name="contentName" widget-style="smallSubmit">
-            <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="ViewSimpleContent?contentId=${contentId}&amp;dataResourceId=${dataResourceId}&amp;communicationEventId=${communicationEventId}&amp;fromDate=${fromDate}"/>
+            <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="ViewSimpleContent">
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="dataResourceId" from-field="dataResourceId"/>
+                <parameter param-name="communicationEventId" from-field="communicationEventId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
         <field name="contentTypeId"><display-entity entity-name="ContentType" description="${description}"/></field>
         <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field>