svn commit: r759506 - in /ofbiz/trunk: applications/manufacturing/webapp/manufacturing/routing/ applications/marketing/webapp/marketing/contact/ applications/party/widget/partymgr/ applications/product/webapp/catalog/config/ applications/product/webapp...

Author: jleroux
Date: Sat Mar 28 16:39:26 2009
New Revision: 759506

URL: http://svn.apache.org/viewvc?rev=759506&view=rev
Log:
9th 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/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
    ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
    ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml

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=759506&r1=759505&r2=759506&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml Sat Mar 28 16:39:26 2009
@@ -281,11 +281,21 @@
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
         <field name="estimatedQuantity" title="${uiLabelMap.ManufacturingQuantity}"><display/></field>
-        <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="EditRoutingProductLink?workEffortId=${workEffortId}&amp;productId=${productId}&amp;fromDate=${fromDate}&amp;workEffortGoodStdTypeId=ROU_PROD_TEMPLATE" description="${uiLabelMap.CommonEdit}" also-hidden="false"/>
-        </field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="removeRoutingProductLink?workEffortId=${workEffortId}&amp;productId=${productId}&amp;fromDate=${fromDate}&amp;workEffortGoodStdTypeId=ROU_PROD_TEMPLATE" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" description="${uiLabelMap.CommonEdit}" widget-style="buttontext">
+            <hyperlink target="EditRoutingProductLink" also-hidden="false">
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+                <parameter param-name="productId" from-field="productId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="workEffortGoodStdTypeId" value="ROU_PROD_TEMPLATE"/>
+            </hyperlink>
+        </field>
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" description="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+            <hyperlink target="removeRoutingProductLink" also-hidden="false">
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+                <parameter param-name="productId" from-field="productId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="workEffortGoodStdTypeId" value="ROU_PROD_TEMPLATE"/>
+            </hyperlink>
         </field>
     </form>
    <form name="ListRoutingTaskProducts" type="list" target="ListRoutingTaskProducts" title="" list-name="allProducts"
@@ -296,10 +306,20 @@
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
         <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="EditRoutingTaskProduct?workEffortId=${workEffortId}&amp;productId=${productId}&amp;fromDate=${fromDate}&amp;workEffortGoodStdTypeId=PRUNT_PROD_DELIV" description="${uiLabelMap.CommonEdit}" also-hidden="false"/>
+            <hyperlink target="EditRoutingTaskProduct" description="${uiLabelMap.CommonEdit}" also-hidden="false">
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+                <parameter param-name="productId" from-field="productId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="workEffortGoodStdTypeId" value="PRUNT_PROD_DELIV"/>
+                </hyperlink>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="removeRoutingTaskProduct?workEffortId=${workEffortId}&amp;productId=${productId}&amp;fromDate=${fromDate}&amp;workEffortGoodStdTypeId=PRUNT_PROD_DELIV" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+            <hyperlink target="removeRoutingTaskProduct" description="${uiLabelMap.CommonDelete}" also-hidden="false">
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+                <parameter param-name="productId" from-field="productId"/>
+                <parameter param-name="fromDate" from-field="fromDate"/>
+                <parameter param-name="workEffortGoodStdTypeId" value="PRUNT_PROD_DELIV"/>
+                </hyperlink>
         </field>
     </form>
     <form name="EditRoutingTaskProduct" type="single" target="updateRoutingTaskProduct" title="" default-map-name="routingProductLink"

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml?rev=759506&r1=759505&r2=759506&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Sat Mar 28 16:39:26 2009
@@ -319,7 +319,11 @@
             </service>
         </actions>
         <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}">
-            <hyperlink description="${communicationEventId}" target="EditContactListCommEvent?contactListId=${contactListId}&amp;communicationEventId=${communicationEventId}&amp;DONE_PAGE=${donePage}" target-type="intra-app"/>
+            <hyperlink description="${communicationEventId}" target="EditContactListCommEvent" target-type="intra-app">
+                <parameter param-name="contactListId" from-field="contactListId"/>
+                <parameter param-name="communicationEventId" from-field="communicationEventId"/>
+                <parameter param-name="DONE_PAGE" from-field="donePage"/>
+            </hyperlink>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
             <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml?rev=759506&r1=759505&r2=759506&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml Sat Mar 28 16:39:26 2009
@@ -106,7 +106,11 @@
         </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="removeUserLoginFromSecurityGroup?userLoginId=${userLoginId}&amp;groupId=${groupId}&amp;fromDate=${fromDate}" also-hidden="false"/>
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="removeUserLoginFromSecurityGroup" also-hidden="false">
+                <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/config/ConfigForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml?rev=759506&r1=759505&r2=759506&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml Sat Mar 28 16:39:26 2009
@@ -227,7 +227,13 @@
                 <parameter param-name="productId" from-field="product.productId"/>
             <hyperlink>
         </field>
-        <field name="remove" widget-style="buttontext" ><hyperlink target="deleteProductConfigProduct?configItemId=${configItemId}&amp;configOptionId=${configOptionId}&amp;productId=${product.productId}" description="${uiLabelMap.CommonRemove}"/></field>
+        <field name="remove" widget-style="buttontext" >
+            <hyperlink target="deleteProductConfigProduct" description="${uiLabelMap.CommonRemove}">
+                <parameter param-name="configItemId" from-field="configItemId"/>
+                <parameter param-name="configOptionId" from-field="configOptionId"/>
+                <parameter param-name="productId" from-field="product.productId"/>
+            <hyperlink>
+        </field>
     </form>
     
 </forms>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=759506&r1=759505&r2=759506&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Sat Mar 28 16:39:26 2009
@@ -455,7 +455,11 @@
             <display-entity entity-name="ShipmentMethodType"/>
         </field>
         <field name="label" title="${uiLabelMap.ProductLabel}">
-          <hyperlink target="viewShipmentPackageRouteSegLabelImage?shipmentId=${shipmentId}&amp;shipmentRouteSegmentId=${shipmentRouteSegmentId}&amp;shipmentPackageSeqId=${shipmentPackageSeqId}" description="${uiLabelMap.ProductLabel}"/>
+          <hyperlink target="viewShipmentPackageRouteSegLabelImage" description="${uiLabelMap.ProductLabel}">
+                <parameter param-name="shipmentId" from-field="shipmentId"/>
+                <parameter param-name="shipmentRouteSegmentId" from-field="shipmentRouteSegmentId"/>
+                <parameter param-name="shipmentPackageSeqId" from-field="shipmentPackageSeqId"/>
+          </hyperlink>
         </field>
         <!-- this is for multi-submitting the mark as accepted action (see batchPrintMarkAsAccepted.ftl) -->
         <field name="carrierServiceStatusId"><hidden value="SHRSCS_ACCEPTED"/></field>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml?rev=759506&r1=759505&r2=759506&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortQuoteForms.xml Sat Mar 28 16:39:26 2009
@@ -54,7 +54,11 @@
         <field name="workEffortId"><hidden/></field>
         <field name="quoteId" widget-style="buttontext"><hyperlink description="${quoteId}" target="/ordermgr/control/EditQuote?quoteId=${quoteId}" target-type="inter-app"/></field>
         <field name="quoteItemSeqId" widget-style="buttontext">
-            <hyperlink description="${quoteItemSeqId}" target="/ordermgr/control/EditQuoteItem?workEffortId=${workEffortId}&amp;quoteId=${quoteId}&amp;quoteItemSeqId=${quoteItemSeqId}" target-type="inter-app"/>
+            <hyperlink description="${quoteItemSeqId}" target="/ordermgr/control/EditQuoteItem" target-type="inter-app">
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
+                <parameter param-name="quoteId" from-field="quoteId"/>
+                <parameter param-name="quoteItemSeqId" from-field="quoteItemSeqId"/>
+            </hyperlink>
         </field>
         <field name="productId"><display/></field>
         <field name="custRequestId"><display/></field>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=759506&r1=759505&r2=759506&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Sat Mar 28 16:39:26 2009
@@ -299,7 +299,11 @@
         <field name="subject"><text size="60" default-value="${parameters.subject}"/></field>
         <field name="fileAttach" title="${uiLabelMap.MyPageFileAttach}"><display/></field>
         <field name="fileAttach" title="${uiLabelMap.MyPageFileAttach}">
-            <hyperlink target="addAttachmentEmail?communicationEventTypeId=${parameters.communicationEventTypeId}&amp;partyId=${userLogin.partyId}&amp;communicationEventId=${parameters.communicationEventId}" description="${uiLabelMap.MyPageAttachFile}"/>
+            <hyperlink target="addAttachmentEmail" description="${uiLabelMap.MyPageAttachFile}">
+                <parameter param-name="communicationEventTypeId" from-field="parameters.communicationEventTypeId"/>
+                <parameter param-name="partyId" from-field="userLogin.partyId"/>
+                <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/>
+             </hyperlink>
         </field>
         <field name="contentMimeTypeId"><hidden value="text/plain"/></field>
         <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="80" rows="20" default-value="${parameters.content}"/></field>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=759506&r1=759505&r2=759506&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Mar 28 16:39:26 2009
@@ -385,7 +385,13 @@
         <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
         <field name="orderDate"><display/></field>
         <field name="entryDate"><display/></field>
-        <field name="linkProjectOrder" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="headerItem.equals(&quot;editProjectOrders&quot;)"><hyperlink target="unLinkProjectOrder?workEffortId=${projectId}&amp;orderId=${orderId}&amp;projectId=${projectId}" description="${uiLabelMap.ProjectMgrRemoveLinkFromProject}"/></field>
+        <field name="linkProjectOrder" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="headerItem.equals(&quot;editProjectOrders&quot;)">
+            <hyperlink target="unLinkProjectOrder" description="${uiLabelMap.ProjectMgrRemoveLinkFromProject}">
+                <parameter param-name="workEffortId" from-field="projectId"/>
+                <parameter param-name="orderId" from-field="orderId"/>
+                <parameter param-name="projectId" from-field="projectId"/>
+            <hyperlink>
+        </field>
     </form>
     <form name="projectAssoOrder"  type="list" list-name="listProjectAssoOrder"
         extends="ListProjects" extends-resource="component://projectmgr/widget/forms/ProjectForms.xml">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=759506&r1=759505&r2=759506&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Sat Mar 28 16:39:26 2009
@@ -34,7 +34,15 @@
             <hyperlink also-hidden="false" description="${lastName}, ${firstName} ${middleName} ${groupName}" target="viewprofile?partyId=${partyId}"/>
         </field>
         <field name="roleTypeId"><hidden/></field>
-        <field name="emailAddess" title="${uiLabelMap.PartyEmailAddress}"><hyperlink target="/partymgr/control/EditCommunicationEvent?partyIdFrom=${userLogin.partyId}&amp;partyIdTo=${partyId}&amp;communicationEventTypeId=EMAIL_COMMUNICATION&amp;contactMechIdTo=${contactMechId}&amp;contactMechTypeId=EMAIL_ADDRESS" description="${emailResult.emailAddress}" target-type="inter-app"/></field>
+        <field name="emailAddess" title="${uiLabelMap.PartyEmailAddress}">
+            <hyperlink target="/partymgr/control/EditCommunicationEvent" description="${emailResult.emailAddress}" target-type="inter-app">
+                <parameter param-name="partyIdFrom" from-field="userLogin.partyId"/>
+                <parameter param-name="partyIdTo" from-field="partyId"/>
+                <parameter param-name="communicationEventTypeId" value="EMAIL_COMMUNICATION"/>
+                <parameter param-name="contactMechIdTo" from-field="contactMechId"/>
+                <parameter param-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
+            <hyperlink>
+        </field>
         <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>