svn commit: r759475 - in /ofbiz/trunk/applications: accounting/webapp/accounting/agreement/ content/widget/compdoc/ content/widget/content/ humanres/widget/forms/ manufacturing/webapp/manufacturing/routing/ party/widget/partymgr/ product/webapp/catalog...

Author: jleroux
Date: Sat Mar 28 14:54:29 2009
New Revision: 759475

URL: http://svn.apache.org/viewvc?rev=759475&view=rev
Log:
5th 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/content/widget/content/ContentForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
    ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.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=759475&r1=759474&r2=759475&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Sat Mar 28 14:54:29 2009
@@ -412,7 +412,12 @@
             <display-entity entity-name="ProductPromo" key-field-name="productPromoId" description="${promoName}"/>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="removeAgreementPromoAppl?productPromoId=${productPromoId}&amp;agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
+            <hyperlink target="removeAgreementPromoAppl" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+                <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>
     </form>
     <form name="EditAgreementPromoAppl" type="single" target="updateAgreementPromoAppl" title="" default-map-name="agreementPromoAppl"

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=759475&r1=759474&r2=759475&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Sat Mar 28 14:54:29 2009
@@ -412,7 +412,12 @@
         </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">
-            <hyperlink description="${uiLabelMap.CommonUpdate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId}, Response ${dataResource.relatedDetailId})" target="EditSurveyResponse?surveyId=${templateDataResource.relatedDetailId}&amp;surveyResponseId=${dataResource.relatedDetailId}&amp;dataResourceId=${dataResource.dataResourceId}&amp;rootContentId=${rootContentId}" also-hidden="false" target-window="_blank"/>
+            <hyperlink description="${uiLabelMap.CommonUpdate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId}, Response ${dataResource.relatedDetailId})" target="EditSurveyResponse" also-hidden="false" target-window="_blank">
+                <parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/>
+                <parameter param-name="surveyResponseId" from-field="dataResource.relatedDetailId"/>
+                <parameter param-name="dataResourceId" from-field="dataResource.dataResourceId"/>
+                <parameter param-name="rootContentId" from-field="rootContentId"/>
+            </hyperlink>
         </field>
         
         <field name="objectInfo" map-name="dataResource" widget-style="tabletext"

Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=759475&r1=759474&r2=759475&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Sat Mar 28 14:54:29 2009
@@ -520,7 +520,12 @@
         </field>
         <field name="createdDate"><display description="${content.createdDate}"/></field>
         <field name="delete" title="${uiLabelMap.CommonDelete}">
-            <hyperlink target="removeDocumentFromTree?contentId=${contentId}&amp;contentIdTo=${contentIdTo}&amp;contentAssocTypeId=${contentAssocTypeId}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/>
+            <hyperlink target="removeDocumentFromTree" description="${uiLabelMap.CommonDelete}">
+                <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>
     <form name="AddDocument"  target="addDocumentToTree" title="" type="single"

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=759475&r1=759474&r2=759475&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Sat Mar 28 14:54:29 2009
@@ -136,7 +136,12 @@
         <field name="comments"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmplPositionReportingStruct?emplPositionIdReportingTo=${emplPositionIdReportingTo}&amp;emplPositionIdManagedBy=${emplPositionIdManagedBy}&amp;fromDate=${fromDate}&amp;emplPositionId=${parameters.emplPositionId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+            <hyperlink target="deleteEmplPositionReportingStruct"  description="${uiLabelMap.CommonDelete}" also-hidden="false">
+                <parameter param-name="emplPositionIdReportingTo" from-field="emplPositionIdReportingTo"/>
+                <parameter param-name="emplPositionIdManagedBy" from-field="emplPositionIdManagedBy"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="emplPositionId" from-field="parameters.emplPositionId"/>
+            </hyperlink>
         </field>        
     </form>
     <form name="AddReportsToEmplPositionReportingStruct" type="single" target="createEmplPositionReportingStruct" title=""
@@ -164,7 +169,12 @@
         <field name="comments"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/> </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteEmplPositionReportingStruct?emplPositionIdReportingTo=${emplPositionIdReportingTo}&amp;emplPositionIdManagedBy=${emplPositionIdManagedBy}&amp;fromDate=${fromDate}&amp;emplPositionId=${parameters.emplPositionId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+            <hyperlink target="deleteEmplPositionReportingStruct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+                <parameter param-name="emplPositionIdReportingTo" from-field="emplPositionIdReportingTo"/>
+                <parameter param-name="emplPositionIdManagedBy" from-field="emplPositionIdManagedBy"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="emplPositionId" from-field="parameters.emplPositionId"/>
+            </hyperlink>
         </field>
     </form>
     <form name="AddReportedToEmplPositionReportingStruct" type="single" target="createEmplPositionReportingStruct" title=""

Modified: ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml?rev=759475&r1=759474&r2=759475&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml Sat Mar 28 14:54:29 2009
@@ -79,7 +79,12 @@
             <hyperlink also-hidden="false" description="${perfReviewItemSeqId}" target="EditPerfReviewItem?perfReviewItemSeqId=${perfReviewItemSeqId}&amp;employeePartyId=${employeePartyId}&amp;employeeRoleTypeId=${employeeRoleTypeId}&amp;perfReviewId=${perfReviewId}"/>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deletePerfReviewItem?perfReviewId=${perfReviewId}&amp;employeePartyId=${employeePartyId}&amp;employeeRoleTypeId=${employeeRoleTypeId}&amp;perfReviewItemSeqId=${perfReviewItemSeqId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+            <hyperlink target="deletePerfReviewItem" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+                <parameter param-name="perfReviewId" from-field="perfReviewId"/>
+                <parameter param-name="employeePartyId" from-field="employeePartyId"/>
+                <parameter param-name="employeeRoleTypeId" from-field="employeeRoleTypeId"/>
+                <parameter param-name="perfReviewItemSeqId" from-field="perfReviewItemSeqId"/>
+            </hyperlink>
         </field>
     </form>      
     <form name="AddPerfReviewItem" type="single" target="createPerfReviewItem" title=""

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml?rev=759475&r1=759474&r2=759475&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml Sat Mar 28 14:54:29 2009
@@ -159,7 +159,12 @@
         </field>
         -->
         <field name="calcelWorkEffortCostCalc" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="removeRoutingTaskCost?costComponentCalcId=${costComponentCalcId}&amp;costComponentTypeId=${costComponentTypeId}&amp;fromDate=${fromDate}&amp;workEffortId=${workEffortId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
+            <hyperlink target="removeRoutingTaskCost" description="${uiLabelMap.CommonRemove}" also-hidden="false">
+                <parameter param-name="costComponentCalcId" from-field="costComponentCalcId"/>
+                <parameter param-name="costComponentTypeId" from-field="costComponentTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+            </hyperlink>
         </field>
     </form>
     <form name="AddRoutingTaskCost" type="single" target="addRoutingTaskCost" title=""
@@ -211,7 +216,13 @@
         <field name="workEffortToSetup" title="${uiLabelMap.ManufacturingTaskEstimatedSetupMillis}" ><display/></field>
         <field name="workEffortToRun" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}" ><display/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="RemoveRoutingTaskAssoc?workEffortId=${workEffortIdFrom}&amp;workEffortIdFrom=${workEffortIdFrom}&amp;workEffortIdTo=${workEffortIdTo}&amp;fromDate=${fromDate}&amp;workEffortAssocTypeId=ROUTING_COMPONENT" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+            <hyperlink target="RemoveRoutingTaskAssoc" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+                <parameter param-name="workEffortId" from-field="workEffortIdFrom"/>
+                <parameter param-name="workEffortIdFrom" from-field="workEffortIdFrom"/>
+                <parameter param-name="workEffortIdTo" from-field="workEffortIdTo"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="workEffortAssocTypeId" value="ROUTING_COMPONENT"/>
+            </hyperlink>
         </field>
         <sort-order>
             <sort-field name="workEffortIdFrom"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml?rev=759475&r1=759474&r2=759475&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml Sat Mar 28 14:54:29 2009
@@ -138,7 +138,12 @@
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink description="${uiLabelMap.CommonRemove}" target="userLogin_removeUserLoginFromSecurityGroup?partyId=${partyId}&amp;userLoginId=${userLoginId}&amp;groupId=${groupId}&amp;fromDate=${fromDate}" also-hidden="false"/>
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="userLogin_removeUserLoginFromSecurityGroup" also-hidden="false">
+                <parameter param-name="partyId" from-field="partyId"/>
+                <parameter param-name="userLoginId" from-field="userLoginId"/>
+                <parameter param-name="groupId" from-field="groupId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
     </form>
 

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml?rev=759475&r1=759474&r2=759475&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml Sat Mar 28 14:54:29 2009
@@ -72,7 +72,12 @@
         <field name="productCategoryId"><hidden/></field>
         <field name="contentId" title="${uiLabelMap.ProductContent}">
             <display-entity entity-name="Content" description="${description}" also-hidden="true">
-                <sub-hyperlink target="EditCategoryContentContent?productCategoryId=${productCategoryId}&amp;contentId=${contentId}&amp;prodCatContentTypeId=${prodCatContentTypeId}&amp;fromDate=${fromDate}" description="${contentId}" link-style="buttontext"/>
+                <sub-hyperlink target="EditCategoryContentContent" description="${contentId"} link-style="buttontext">
+                <parameter param-name="productCategoryId" from-field="productCategoryId"/>
+                <parameter param-name="contentId" from-field="contentId"/>
+                <parameter param-name="prodCatContentTypeId" from-field="prodCatContentTypeId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </sub-hyperlink>
             </display-entity>
         </field>
         <field name="prodCatContentTypeId" title="${uiLabelMap.ProductType}">

Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml?rev=759475&r1=759474&r2=759475&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml Sat Mar 28 14:54:29 2009
@@ -321,7 +321,12 @@
         <field name="updateFeaturePrice" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="lastModifiedBy" title="${uiLabelMap.ProductLastModifiedBy}"><display description="[${lastModifiedByUserLogin}] ${uiLabelMap.CommonOn} ${lastModifiedDate}"/></field>
         <field name="deleteFeaturePrice" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deleteFeaturePrice?productFeatureId=${productFeatureId}&amp;productPriceTypeId=${productPriceTypeId}&amp;currencyUomId=${currencyUomId}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+            <hyperlink target="deleteFeaturePrice" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+                <parameter param-name="productFeatureId" from-field="productFeatureId"/>
+                <parameter param-name="productPriceTypeId" from-field="productPriceTypeId"/>
+                <parameter param-name="currencyUomId" from-field="currencyUomId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+            </hyperlink>
         </field>
     </form>
     <form name="CreateFeaturePrice" type="single" target="createFeaturePrice">

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml?rev=759475&r1=759474&r2=759475&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml Sat Mar 28 14:54:29 2009
@@ -151,7 +151,12 @@
         <field name="volume" title="${uiLabelMap.CommonVolume}"><display/></field>
         <field name="volumeUom" title="${uiLabelMap.CommonUom}"><display/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="removeOrderShipmentFromShipment?shipmentId=${shipmentId}&amp;shipmentItemSeqId=${shipmentItemSeqId}&amp;orderId=${orderId}&amp;orderItemSeqId=${orderItemSeqId}" description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
+            <hyperlink target="removeOrderShipmentFromShipment" description="[${uiLabelMap.CommonDelete}]" also-hidden="false">
+                <parameter param-name="shipmentId" from-field="shipmentId"/>
+                <parameter param-name="shipmentItemSeqId" from-field="shipmentItemSeqId"/>
+                <parameter param-name="orderId" from-field="orderId"/>
+                <parameter param-name="orderItemSeqId" from-field="orderItemSeqId"/>
+            </hyperlink>
         </field>
     </form>
     <!-- Add entries to Shipment Plan -->