svn commit: r759464 - in /ofbiz/trunk: applications/humanres/widget/forms/ applications/manufacturing/webapp/manufacturing/jobshopmgt/ specialpurpose/mypage/widget/ specialpurpose/myportal/widget/

Author: jleroux
Date: Sat Mar 28 14:06:16 2009
New Revision: 759464

URL: http://svn.apache.org/viewvc?rev=759464&view=rev
Log:
3d 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/humanres/widget/forms/EmploymentForms.xml
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=759464&r1=759463&r2=759464&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Sat Mar 28 14:06:16 2009
@@ -66,7 +66,13 @@
         <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field>
         <field name="terminationTypeId"><display/></field>
         <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="EditEmployment?partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;fromDate=${fromDate}&amp;roleTypeIdTo=${roleTypeIdTo}" description="${uiLabelMap.CommonEdit}"/>
+            <hyperlink target="EditEmployment" description="${uiLabelMap.CommonEdit}">
+ <parameter param-name="partyIdFrom" from-field="partyIdFrom"/>
+ <parameter param-name="partyIdTo" from-field="partyIdTo"/>
+ <parameter param-name="roleTypeIdFrom" from-field="roleTypeIdFrom"/>
+ <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="roleTypeIdTo" from-field="roleTypeIdTo"/>
+ </hyperlink>
         </field>
     </form>
     <form name="ListEmployments" type="list" paginate-target="FindEmployments" default-entity-name="EmploymentAndPerson" list-name="listIt" separate-columns="true"
@@ -86,7 +92,13 @@
         <field name="terminationReasonId" title="${uiLabelMap.HumanResTerminationReasonId}"><display/></field>
         <field name="terminationTypeId"><display/></field>
         <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="EditEmployment?partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;fromDate=${fromDate}&amp;roleTypeIdTo=${roleTypeIdTo}" description="${uiLabelMap.CommonEdit}"/>
+            <hyperlink target="EditEmployment" description="${uiLabelMap.CommonEdit}">
+ <parameter param-name="partyIdFrom" from-field="partyIdFrom"/>
+ <parameter param-name="partyIdTo" from-field="partyIdTo"/>
+ <parameter param-name="roleTypeIdFrom" from-field="roleTypeIdFrom"/>
+ <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="roleTypeIdTo" from-field="roleTypeIdTo"/>
+ </hyperlink>
         </field>
     </form>
     <form name="EditEmployment" type="single" target="updateEmployment" default-map-name="employment"
@@ -157,7 +169,13 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="deletePayHistory?roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/>
+            <hyperlink target="deletePayHistory" description="${uiLabelMap.CommonDelete}">
+ <parameter param-name="roleTypeIdFrom" from-field="roleTypeIdFrom"/>
+ <parameter param-name="roleTypeIdTo" from-field="roleTypeIdTo"/>
+ <parameter param-name="partyIdFrom" from-field="partyIdFrom"/>
+ <parameter param-name="partyIdTo" from-field="partyIdTo"/>
+ <parameter param-name="fromDate" from-field="fromDate"/>
+ </hyperlink>
         </field>
     </form>          
     <form name="ListPartyBenefits" type="multi" target="updatePartyBenefit?benefitTypeId=${benefitTypeId}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}" title="" paginate-target="findPartyBenefits"

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=759464&r1=759463&r2=759464&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Sat Mar 28 14:06:16 2009
@@ -748,7 +748,13 @@
         <field name="estimatedQuantity"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
-            <hyperlink target="deleteProductionRunComponent?workEffortId=${workEffortId}&amp;fromDate=${fromDate}&amp;productId=${productId}&amp;workEffortGoodStdTypeId=${workEffortGoodStdTypeId}&amp;productionRunId=${productionRunId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+            <hyperlink target="deleteProductionRunComponent"  description="${uiLabelMap.CommonDelete" also-hidden="false">
+ <parameter param-name="workEffortId" from-field="workEffortId"/>
+ <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="productId" from-field="productId"/>
+ <parameter param-name="workEffortGoodStdTypeId" from-field="workEffortGoodStdTypeId"/>
+ <parameter param-name="productionRunId" from-field="productionRunId}"/>
+ </hyperlink>
         </field>
     </form>
     <form name="ProductionRunTaskActualComponents" type="list" target="updateProductionRunComponent" paginate-target="ProductionRunActualComponents" title="" list-name="records"

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=759464&r1=759463&r2=759464&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Sat Mar 28 14:06:16 2009
@@ -28,9 +28,26 @@
         </field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><hyperlink target="/projectmgr/control/projectView?projectId=${resultProject.projectId}"  target-type="inter-app" target-window="_BLANK" description="${resultProject.projectName}"/></field>
         <field name="roleTypeId" parameter-name="newRoleTypeId" title="${uiLabelMap.PartyRole}"><hidden value="${roleTypeId}"/></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&amp;donePage=${parameters.donePage}" description="${uiLabelMap.CommonRemove}"/></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"/>
+ <parameter param-name="statusId=donePage" from-field="parameters.donePage"/>
+ </hyperlink>
+        </field>
         <!-- better set to complete on the timesheet -->
-        <!-- field name="toComplete" title="${uiLabelMap.MyPageToComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED&amp;donePage=${parameters.donePage}" description="${uiLabelMap.MyPageToComplete}"/></field-->
+        <!-- field name="toComplete" title="${uiLabelMap.MyPageToComplete}">
+            <hyperlink target="updateTaskAssigment" description="${uiLabelMap.MyPageToComplete}">
+ <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"/>
+ <parameter param-name="statusId=donePage" from-field="parameters.donePage"/>
+            </hyperlink>
+        </field-->
     </form>
     
     <form name="EditWeekTimesheet" extends="EditWeekTimesheet" extends-resource="component://projectmgr/widget/forms/TimeSheetForms.xml">

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=759464&r1=759463&r2=759464&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Sat Mar 28 14:06:16 2009
@@ -28,9 +28,25 @@
         </field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><hyperlink target="/projectmgr/control/projectView?projectId=${resultProject.projectId}"  target-type="inter-app" target-window="_BLANK" description="${resultProject.projectName}"/></field>
         <field name="roleTypeId" parameter-name="newRoleTypeId" title="${uiLabelMap.PartyRole}"><hidden value="${roleTypeId}"/></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&amp;portalPageId=${parameters.portalPageId}" description="${uiLabelMap.CommonRemove}"/></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"/>
+ <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
+ </hyperlink>
+        </field>
         <!-- better set to complete on the timesheet -->
-        <!-- field name="toComplete" title="${uiLabelMap.MyPortalToComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED&amp;donePage=${parameters.donePage}" description="${uiLabelMap.MyPortalToComplete}"/></field-->
+        <!-- field name="toComplete" title="${uiLabelMap.MyPortalToComplete}"><hyperlink target="updateTaskAssigment" description="${uiLabelMap.MyPortalToComplete}">
+ <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"/>
+ <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
+ </hyperlink>
+        </field-->
     </form>
     
     <form name="EditWeekTimesheet" extends="EditWeekTimesheet" extends-resource="component://projectmgr/widget/forms/TimeSheetForms.xml">