Author: jleroux
Date: Sat Mar 28 19:45:05 2009 New Revision: 759562 URL: http://svn.apache.org/viewvc?rev=759562&view=rev Log: 12th 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/accounting/widget/BillingAccountForms.xml ofbiz/trunk/applications/accounting/widget/GlForms.xml ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml ofbiz/trunk/applications/content/widget/forum/BlogForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.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=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Sat Mar 28 19:45:05 2009 @@ -130,7 +130,10 @@ <display-entity entity-name="AgreementItemType"/> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="removeAgreementItem?agreementItemSeqId=${agreementItemSeqId}&agreementId=${agreementId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/> + <hyperlink target="removeAgreementItem" description="${uiLabelMap.CommonRemove}" also-hidden="false"> + <parameter param-name="agreementItemSeqId" from-field="agreementItemSeqId"/> + <parameter param-name="agreementId" from-field="agreementId"/> + </hyperlink> </field> </form> @@ -208,7 +211,10 @@ </drop-down> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deleteAgreementTerm?agreementTermId=${agreementTermId}&agreementId=${agreementId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/> + <hyperlink target="deleteAgreementTerm" description="${uiLabelMap.CommonRemove}" also-hidden="false"> + <parameter param-name="agreementTermId" from-field="agreementTermId"/> + <parameter param-name="agreementId" from-field="agreementId"/> + </hyperlink> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Sat Mar 28 19:45:05 2009 @@ -92,7 +92,10 @@ <field name="total" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> <field name="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field> <field name="capture" use-when="${bsh:!paidInvoice}" widget-style="buttontext"> - <hyperlink target="capturePaymentsByInvoice?invoiceId=${invoiceId}&billingAccountId=${billingAccountId}" description="${uiLabelMap.AccountingCapture}"/> + <hyperlink target="capturePaymentsByInvoice" description="${uiLabelMap.AccountingCapture}"> + <parameter param-name="invoiceId" from-field="invoiceId"/> + <parameter param-name="billingAccountId" from-field="billingAccountId"/> + </hyperlink> </field> <field name="capture" use-when="${bsh:paidInvoice}"><display/></field> </form> Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Sat Mar 28 19:45:05 2009 @@ -149,7 +149,10 @@ <hyperlink description="${uiLabelMap.AccountingVerifyTransaction}" target="postAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}&verifyOnly=Y" also-hidden="false"/> </field> <field name="post" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink description="${uiLabelMap.AccountingPostTransaction}" target="postAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}" also-hidden="false"/> + <hyperlink description="${uiLabelMap.AccountingPostTransaction}" target="postAcctgTrans" also-hidden="false"> + <parameter param-name="acctgTransId" from-field="acctgTransId"/> + <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + </hyperlink> </field> </form> Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Sat Mar 28 19:45:05 2009 @@ -95,7 +95,10 @@ <set field="parameters.creditTotal" value="${bsh:(showCredit ? (creditTotal.add(absolutePostedBalance)) : (creditTotal))}" type="BigDecimal"/> </row-actions> <field name="glAccountId" use-when="!showTotals"> - <hyperlink target="FindAcctgTransEntries?glAccountId=${glAccountId}&organizationPartyId=${organizationPartyId}" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"/> + <hyperlink target="FindAcctgTransEntries" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"> + <parameter param-name="glAccountId" from-field="glAccountId"/> + <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + </hyperlink> </field> <field name="debit" use-when="showDebit"><display description="${absolutePostedBalance}" type="currency" currency="${currencyUomId}"/></field> <field name="debit" use-when="showCredit"><display/></field> @@ -129,7 +132,10 @@ </entity-one> </row-actions> <field name="glAccountId"> - <hyperlink target="FindAcctgTransEntries?glAccountId=${glAccountId}&organizationPartyId=${organizationPartyId}" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"/> + <hyperlink target="FindAcctgTransEntries" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"> + <parameter param-name="glAccountId" from-field="glAccountId"/> + <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + </hyperlink> </field> <field name="totalAmount"><display type="currency" currency="${currencyUomId}"/></field> </form> @@ -177,7 +183,10 @@ </entity-one> </row-actions> <field name="glAccountId"> - <hyperlink target="FindAcctgTransEntries?glAccountId=${glAccountId}&organizationPartyId=${organizationPartyId}" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"/> + <hyperlink target="FindAcctgTransEntries" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"> + <parameter param-name="glAccountId" from-field="glAccountId"/> + <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + </hyperlink> </field> <field name="totalAmount"><display type="currency" currency="${currencyUomId}"/></field> </form> @@ -189,7 +198,10 @@ </entity-one> </row-actions> <field name="glAccountId"> - <hyperlink target="FindAcctgTransEntries?glAccountId=${glAccountId}&organizationPartyId=${organizationPartyId}" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"/> + <hyperlink target="FindAcctgTransEntries" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"> + <parameter param-name="glAccountId" from-field="glAccountId"/> + <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + </hyperlink> </field> <field name="totalAmount"><display type="currency" currency="${currencyUomId}"/></field> </form> @@ -201,7 +213,10 @@ </entity-one> </row-actions> <field name="glAccountId"> - <hyperlink target="FindAcctgTransEntries?glAccountId=${glAccountId}&organizationPartyId=${organizationPartyId}" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"/> + <hyperlink target="FindAcctgTransEntries" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"> + <parameter param-name="glAccountId" from-field="glAccountId"/> + <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + </hyperlink> </field> <field name="totalAmount"><display type="currency" currency="${currencyUomId}"/></field> </form> Modified: ofbiz/trunk/applications/content/widget/forum/BlogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/BlogForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/BlogForms.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/BlogForms.xml Sat Mar 28 19:45:05 2009 @@ -38,7 +38,10 @@ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <field name="contentId"><hidden/></field> <field name="contentName" widget-style="tabletext"> - <hyperlink target="ViewBlogArticle?articleContentId=${contentId}&blogContentId=${parameters.blogContentId}" description="${contentName} [${contentId}]"/> + <hyperlink target="ViewBlogArticle" description="${contentName} [${contentId}]"> + <parameter param-name="articleContentId" from-field="contentId"/> + <parameter param-name="blogContentId" from-field="parameters.blogContentId"/> + </hyperlink> </field> <field name="description"><display/></field> <field name="statusId"><display-entity entity-name="StatusItem"></display-entity></field> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Sat Mar 28 19:45:05 2009 @@ -96,7 +96,10 @@ <field name="rating"><text/></field> <field name="skillLevel"><text/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="deleteEmployeeSkill?skillTypeId=${skillTypeId}&&partyId=${partyId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteEmployeeSkill" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="skillTypeId" from-field="skillTypeId"/> + <parameter param-name="partyId" from-field="partyId"/> + </hyperlink> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml Sat Mar 28 19:45:05 2009 @@ -88,7 +88,10 @@ </field> <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="deletePartyQual?partyId=${partyId}&partyQualTypeId=${partyQualTypeId}" also-hidden="false" description="${uiLabelMap.CommonDelete}"/> + <hyperlink target="deletePartyQual" also-hidden="false" description="${uiLabelMap.CommonDelete}"> + <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="partyQualTypeId" from-field="partyQualTypeId"/> + </hyperlink> </field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> </form> Modified: ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartySkillForms.xml Sat Mar 28 19:45:05 2009 @@ -36,7 +36,7 @@ <field name="skillLevel"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> + </form> <form name="ListPartySkills" type="list" list-name="listIt" use-row-submit="true" separate-columns="true" target="updatePartySkillExt" paginate-target="findPartySkills" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> @@ -45,7 +45,7 @@ <order-by field-name="skillTypeId"/> </entity-condition> </actions> - <auto-fields-service default-field-type="hidden" service-name="updatePartySkill"/> + <auto-fields-service default-field-type="hidden" service-name="updatePartySkill"/> <field name="skillTypeId"> <display-entity entity-name="SkillType" description="${description}"/> </field> @@ -53,10 +53,13 @@ <field name="rating"><text/></field> <field name="skillLevel"><text/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="deletePartySkill?skillTypeId=${skillTypeId}&&partyId=${partyId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deletePartySkill" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="skillTypeId" from-field="skillTypeId"/> + <parameter param-name="partyId" from-field="partyId"/> + </hyperlink> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - </form> + </form> <form name="AddPartySkills" type="single" target="createPartySkill" default-map-name="partySkill" header-row-style="header-row" default-table-style="basic-table"> <actions> @@ -71,10 +74,10 @@ <entity-order-by field-name="description"/> </entity-options> </drop-down> - </field> + </field> <field name="yearsExperience"><text/></field> <field name="rating"><text/></field> <field name="skillLevel"><text/></field> - <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> </forms> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml Sat Mar 28 19:45:05 2009 @@ -61,7 +61,10 @@ <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deleteSalaryStep?salaryStepSeqId=${salaryStepSeqId}&payGradeId=${payGradeId}" description="${uiLabelMap.CommonDelete}"/> + <hyperlink target="deleteSalaryStep" description="${uiLabelMap.CommonDelete}"> + <parameter param-name="salaryStepSeqId" from-field="salaryStepSeqId"/> + <parameter param-name="payGradeId" from-field="payGradeId"/> + </hyperlink> </field> </form> <form name="AddSalaryStep" type="single" target="createSalaryStep" Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml Sat Mar 28 19:45:05 2009 @@ -138,7 +138,10 @@ <form name="ListBom" type="list" list-name="ListProductBom" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="FindBom"> <field name="productId" title="${uiLabelMap.ProductProductId}" use-when=""> - <hyperlink target="EditProductBom?productId=${productId}&productAssocTypeId=${productAssocTypeId}" description="${productId}"/> + <hyperlink target="EditProductBom" description="${productId}"> + <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productAssocTypeId" from-field="productAssocTypeId"/> + </hyperlink> </field> <field name="internalName" title="${uiLabelMap.ProductProductName}"><display/></field> <field name="productAssocTypeId" title="${uiLabelMap.ManufacturingBomType}"> 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=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Sat Mar 28 19:45:05 2009 @@ -162,16 +162,22 @@ <!--<field name="estimatedMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedMilliSeconds}" ><display/></field>--> <field name="estimatedTotalMilliSeconds" title="${uiLabelMap.ManufacturingTaskEstimatedTotalMilliSeconds}" ><display/></field> <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> - <hyperlink target="ProductionRunTasks?routingTaskId=${workEffortId}&productionRunId=${workEffortParentId}" description="${uiLabelMap.CommonEdit}" also-hidden="false"/> + <hyperlink target="ProductionRunTasks" description="${uiLabelMap.CommonEdit}" also-hidden="false"> + <parameter param-name="routingTaskId" from-field="workEffortId"/> + <parameter param-name="productionRunId" from-field="workEffortParentId"/> + </hyperlink> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> <!--<hyperlink target="RemoveRoutingTaskAssoc" description="[${uiLabelMap.CommonDelete}]" also-hidden="false"> - <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>--> - <hyperlink target="deleteProductionRunRoutingTask?workEffortId=${workEffortId}&productionRunId=${workEffortParentId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <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>--> + <hyperlink target="deleteProductionRunRoutingTask" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="productionRunId" from-field="workEffortParentId"/> + </hyperlink> </field> </form> @@ -326,19 +332,34 @@ <field name="actualMilliSeconds" title="${uiLabelMap.ManufacturingTaskActualMilliSeconds}" ><display/></field> <field name="quantityProduced" title="${uiLabelMap.ManufacturingQuantityProduced}" ><display/></field> <field name="startLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit" use-when=""${startTaskId}".equals("${workEffortId}")"> - <hyperlink target="changeProductionRunTaskStatus?workEffortId=${workEffortId}&productionRunId=${workEffortParentId}" description="${uiLabelMap.ManufacturingStartProductionRunTask}" also-hidden="false"/> + <hyperlink target="changeProductionRunTaskStatus" description="${uiLabelMap.ManufacturingStartProductionRunTask}" also-hidden="false"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="productionRunId" from-field="workEffortParentId"/> + </hyperlink> </field> <field name="issueLinkAtp" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit" use-when=""${issueTaskId}".equals("${workEffortId}")"> - <hyperlink target="issueProductionRunRoutingTask?workEffortId=${workEffortId}&productionRunId=${workEffortParentId}&failIfItemsAreNotAvailable=Y" description="${uiLabelMap.ManufacturingIssueAvailableProductionRunTask}" also-hidden="false"/> + <hyperlink target="issueProductionRunRoutingTask" also-hidden="false"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="productionRunId" from-field="workEffortParentId}&failIfItemsAreNotAvailable=Y" description="${uiLabelMap.ManufacturingIssueAvailableProductionRunTask"/> + </hyperlink> </field> <field name="issueLinkQoh" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit" use-when=""${issueTaskId}".equals("${workEffortId}")"> - <hyperlink target="issueProductionRunRoutingTask?workEffortId=${workEffortId}&productionRunId=${workEffortParentId}&failIfItemsAreNotAvailable=N" description="${uiLabelMap.ManufacturingIssueProductionRunTask}" also-hidden="false"/> + <hyperlink target="issueProductionRunRoutingTask" also-hidden="false"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="productionRunId" from-field="workEffortParentId}&failIfItemsAreNotAvailable=N" description="${uiLabelMap.ManufacturingIssueProductionRunTask"/> + </hyperlink> </field> <field name="declareLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit" use-when=""PRUN_RUNNING".equals("${currentStatusId}")"> - <hyperlink target="ProductionRunDeclaration?actionForm=EditRoutingTask&routingTaskId=${workEffortId}&productionRunId=${workEffortParentId}" description="${uiLabelMap.ManufacturingDeclareProductionRunTask}" also-hidden="false"/> + <hyperlink target="ProductionRunDeclaration" description="${uiLabelMap.ManufacturingDeclareProductionRunTask}" also-hidden="false"> + <parameter param-name="actionForm=EditRoutingTask&routingTaskId" from-field="workEffortId"/> + <parameter param-name="productionRunId" from-field="workEffortParentId"/> + </hyperlink> </field> <field name="completeLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit" use-when=""${completeTaskId}".equals("${workEffortId}")"> - <hyperlink target="changeProductionRunTaskStatus?workEffortId=${workEffortId}&productionRunId=${workEffortParentId}" description="${uiLabelMap.ManufacturingCompleteProductionRunTask}" also-hidden="false"/> + <hyperlink target="changeProductionRunTaskStatus" description="${uiLabelMap.ManufacturingCompleteProductionRunTask}" also-hidden="false"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="productionRunId" from-field="workEffortParentId"/> + </hyperlink> </field> </form> <form name="ListIssueProductionRunDeclComponents" type="multi" target="issueProductionRunTaskComponents?productionRunId=${productionRunId}" title="" list-name="productionRunComponentsDataReadyForIssuance" Modified: ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml Sat Mar 28 19:45:05 2009 @@ -184,7 +184,10 @@ </service> </actions> <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}"> - <hyperlink description="${visitId}" target="/partymgr/control/visitdetail?visitId=${visitId}&DONE_PAGE=${donePage}" target-type="inter-app"/> + <hyperlink description="${visitId}" target="/partymgr/control/visitdetail" target-type="inter-app"> + <parameter param-name="visitId" from-field="visitId"/> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </hyperlink> </field> <field name="sourceEnumId" title="${uiLabelMap.MarketingTrackingCodeVisitSourceEnumId}"> <display-entity description="${description} [${enumCode}]" entity-name="Enumeration" key-field-name="enumId"/> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml Sat Mar 28 19:45:05 2009 @@ -210,7 +210,10 @@ </field> <field name="custRequestItemSeqId"><hidden/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="removeQuoteItem?quoteItemSeqId=${quoteItemSeqId}&quoteId=${quoteId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/> + <hyperlink target="removeQuoteItem" description="${uiLabelMap.CommonRemove}" also-hidden="false"> + <parameter param-name="quoteItemSeqId" from-field="quoteItemSeqId"/> + <parameter param-name="quoteId" from-field="quoteId"/> + </hyperlink> </field> </form> <form name="EditQuoteItem" type="single" target="updateQuoteItem" title="" default-map-name="quoteItem" @@ -269,7 +272,10 @@ <field name="attrValue" title="${uiLabelMap.OrderOrderQuoteAttributeValue}"></field> <field name="quoteId"><hidden/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="removeQuoteAttribute?attrName=${attrName}&quoteId=${quoteId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/> + <hyperlink target="removeQuoteAttribute" description="${uiLabelMap.CommonRemove}" also-hidden="false"> + <parameter param-name="attrName" from-field="attrName"/> + <parameter param-name="quoteId" from-field="quoteId"/> + </hyperlink> </field> </form> <form name="EditQuoteAttribute" type="single" target="updateQuoteAttribute" title="" default-map-name="quoteAttribute" @@ -292,7 +298,10 @@ <field name="coeffValue" title="${uiLabelMap.OrderOrderQuoteCoeffValue}"></field> <field name="quoteId"><hidden/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="removeQuoteCoefficient?coeffName=${coeffName}&quoteId=${quoteId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/> + <hyperlink target="removeQuoteCoefficient" description="${uiLabelMap.CommonRemove}" also-hidden="false"> + <parameter param-name="coeffName" from-field="coeffName"/> + <parameter param-name="quoteId" from-field="quoteId"/> + </hyperlink> </field> </form> <form name="EditQuoteCoefficient" type="single" target="updateQuoteCoefficient" title="" default-map-name="quoteCoefficient" @@ -351,7 +360,10 @@ <display-entity entity-name="OrderAdjustmentType" key-field-name="orderAdjustmentTypeId"/> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="removeQuoteAdjustment?quoteAdjustmentId=${quoteAdjustmentId}&quoteId=${quoteId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/> + <hyperlink target="removeQuoteAdjustment" description="${uiLabelMap.CommonRemove}" also-hidden="false"> + <parameter param-name="quoteAdjustmentId" from-field="quoteAdjustmentId"/> + <parameter param-name="quoteId" from-field="quoteId"/> + </hyperlink> </field> </form> <form name="EditQuoteAdjustment" type="single" target="updateQuoteAdjustment" title="" default-map-name="quoteAdjustment" Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml Sat Mar 28 19:45:05 2009 @@ -182,7 +182,10 @@ <field name="tarpitDuration" title="${uiLabelMap.PartyTarpitDuration}"><text/></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="removeProtectedViewFromSecurityGroup?groupId=${groupId}&viewNameId=${viewNameId}" also-hidden="false"/> + <hyperlink description="${uiLabelMap.CommonRemove}" target="removeProtectedViewFromSecurityGroup" also-hidden="false"> + <parameter param-name="groupId" from-field="groupId"/> + <parameter param-name="viewNameId" from-field="viewNameId"/> + </hyperlink> </field> </form> 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=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml Sat Mar 28 19:45:05 2009 @@ -180,7 +180,10 @@ <field name="productFeatureIactnTypeId"><display-entity entity-name="ProductFeatureIactnType"/></field> <field name="removeFeatureInterAction" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="removeProductFeatureIactn?productFeatureId=${productFeatureId}&productFeatureIdTo=${productFeatureIdTo}" description="${uiLabelMap.CommonDelete}"/> + <hyperlink target="removeProductFeatureIactn" description="${uiLabelMap.CommonDelete}"> + <parameter param-name="productFeatureId" from-field="productFeatureId"/> + <parameter param-name="productFeatureIdTo" from-field="productFeatureIdTo"/> + </hyperlink> </field> </form> <form name="EditFeatureInterAction" type="single" target="createProductFeatureIactn" title="" default-map-name="productFeatureIactn" Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Sat Mar 28 19:45:05 2009 @@ -398,10 +398,16 @@ <display-entity entity-name="Enumeration" description="${description}" key-field-name="enumId"/> </field> <field name="remove" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="RemoveProductStoreFinAccountSettings?productStoreId=${productStoreId}&finAccountTypeId=${finAccountTypeId}" description="${uiLabelMap.CommonRemove}"/> + <hyperlink target="RemoveProductStoreFinAccountSettings" description="${uiLabelMap.CommonRemove}"> + <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="finAccountTypeId" from-field="finAccountTypeId"/> + </hyperlink> </field> <field name="edit" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="EditProductStoreFinAccountSettings?productStoreId=${productStoreId}&finAccountTypeId=${finAccountTypeId}" description="${uiLabelMap.CommonEdit}"/> + <hyperlink target="EditProductStoreFinAccountSettings" description="${uiLabelMap.CommonEdit}"> + <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="finAccountTypeId" from-field="finAccountTypeId"/> + </hyperlink> </field> </form> <form name="EditProductStoreFinAccountSettings" type="single" target="UpdateProductStoreFinAccountSettings" default-map-name="finAccountSetting" @@ -555,7 +561,10 @@ <auto-fields-entity entity-name="ProductStoreShipmentMeth" default-field-type="display"/> <field name="productStoreId"><hidden/></field> <field name="productStoreShipMethId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="EditProductStoreShipSetup?productStoreId=${productStoreId}&productStoreShipMethId=${productStoreShipMethId}" description="${productStoreShipMethId}" also-hidden="false"/> + <hyperlink target="EditProductStoreShipSetup" description="${productStoreShipMethId}" also-hidden="false"> + <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreShipMethId" from-field="productStoreShipMethId"/> + </hyperlink> </field> <field name="shipmentMethodTypeId" title="${uiLabelMap.ProductMethod}"> <display-entity entity-name="ShipmentMethodType" description="${description}" cache="true" also-hidden="true"/> @@ -568,7 +577,10 @@ <display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoId}]"/> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="storeRemoveShipMeth?productStoreId=${productStoreId}&productStoreShipMethId=${productStoreShipMethId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/> + <hyperlink target="storeRemoveShipMeth" description="${uiLabelMap.CommonRemove}" also-hidden="false"> + <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="productStoreShipMethId" from-field="productStoreShipMethId"/> + </hyperlink> </field> </form> <form name="EditProductStoreShipmentMeth" type="single" target="storeUpdateShipMeth" title="" default-map-name="productStoreShipmentMeth" @@ -639,7 +651,10 @@ <field name="productStoreId"><hidden/></field> <field name="carrierRoleTypeId"><hidden/></field> <field name="shipmentCostEstimateId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="EditProductStoreShipmentCostEstimates?productStoreId=${productStoreId}&shipmentCostEstimateId=${shipmentCostEstimateId}" description="${shipmentCostEstimateId}" also-hidden="false"/> + <hyperlink target="EditProductStoreShipmentCostEstimates" description="${shipmentCostEstimateId}" also-hidden="false"> + <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="shipmentCostEstimateId" from-field="shipmentCostEstimateId"/> + </hyperlink> </field> <field name="shipmentMethodTypeId" title="${uiLabelMap.ProductMethod}"> <display-entity entity-name="ShipmentMethodType" description="${description}" cache="true" also-hidden="true"/> @@ -669,7 +684,10 @@ <display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/> </field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="storeRemoveShipRate?productStoreId=${productStoreId}&shipmentCostEstimateId=${shipmentCostEstimateId}" description="${uiLabelMap.CommonRemove}" also-hidden="false"/> + <hyperlink target="storeRemoveShipRate" description="${uiLabelMap.CommonRemove}" also-hidden="false"> + <parameter param-name="productStoreId" from-field="productStoreId"/> + <parameter param-name="shipmentCostEstimateId" from-field="shipmentCostEstimateId"/> + </hyperlink> </field> </form> <form name="AddShipmentCostEstimate" type="single" target="storeCreateShipRate" title="" 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=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Sat Mar 28 19:45:05 2009 @@ -90,7 +90,10 @@ </service> </actions> <field name="inventoryItemId" widget-style="buttontext"> - <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}&facilityId=${facilityId}" description="${inventoryItemId}"/> + <hyperlink target="EditInventoryItem" description="${inventoryItemId}"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + <parameter param-name="facilityId" from-field="facilityId"/> + </hyperlink> </field> <field name="inventoryItemTypeId" title="${uiLabelMap.ProductInventoryItemTypeId}"> <display-entity entity-name="InventoryItemType"/> @@ -103,7 +106,10 @@ </field> <field name="internalName"><display/></field> <field name="locationSeqId" widget-style="buttontext"> - <hyperlink target="EditFacilityLocation?facilityId=${facilityId}&locationSeqId=${locationSeqId}" description="${areaId}:${aisleId}:${sectionId}:${levelId}:${positionId} [${locationSeqId}]"/> + <hyperlink target="EditFacilityLocation" description="${areaId}:${aisleId}:${sectionId}:${levelId}:${positionId} [${locationSeqId}]"> + <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="locationSeqId" from-field="locationSeqId"/> + </hyperlink> </field> <field name="enumId" entry-name="locationTypeEnumId" title="${uiLabelMap.CommonType}"> <display-entity entity-name="Enumeration"/> @@ -114,14 +120,20 @@ <field name="softIdentifier"><display/></field> <field name="quantityOnHandTotal"><display description="${availableToPromiseTotal} / ${quantityOnHandTotal}"/></field> <field name="transfer" title="${uiLabelMap.ProductTransfer}" entry-name="inventoryItemId" widget-style="buttontext"> - <hyperlink target="TransferInventoryItem?facilityId=${facilityId}&inventoryItemId=${inventoryItemId}" description="${uiLabelMap.ProductTransfer}"/> + <hyperlink target="TransferInventoryItem" description="${uiLabelMap.ProductTransfer}"> + <parameter param-name="facilityId" from-field="facilityId"/> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + </hyperlink> </field> </form> <form name="ListFacilityInventoryItemsNoLocations" type="list" target="" title="" list-name="inventoryItems" override-list-size="${inventoryItemsSize}" paginate-target="SearchInventoryItemsByLabels" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="inventoryItemId" widget-style="buttontext"> - <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}&facilityId=${facilityId}" description="${inventoryItemId}"/> + <hyperlink target="EditInventoryItem" description="${inventoryItemId}"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + <parameter param-name="facilityId" from-field="facilityId"/> + </hyperlink> </field> <field name="inventoryItemTypeId" title="${uiLabelMap.ProductInventoryItemTypeId}"> <display-entity entity-name="InventoryItemType"/> @@ -198,7 +210,10 @@ </row-actions> <field name="inventoryItemId" widget-style="buttontext" position="1" use-when="showPosition1"> - <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}&facilityId=${facilityId}" description="${inventoryItemId}"/> + <hyperlink target="EditInventoryItem" description="${inventoryItemId}"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + <parameter param-name="facilityId" from-field="facilityId"/> + </hyperlink> </field> <field name="productId" position="1" use-when="showPosition1" widget-style="buttontext"> <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/> @@ -254,7 +269,10 @@ <field name="effectiveDate" position="2"><display/></field> <field name="inventoryItemId" widget-style="buttontext" position="2"> - <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}&facilityId=${facilityId}" description="${inventoryItemId}"/> + <hyperlink target="EditInventoryItem" description="${inventoryItemId}"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + <parameter param-name="facilityId" from-field="facilityId"/> + </hyperlink> </field> <field name="inventoryItemDetailSeqId" position="2"><display/></field> <field name="quantityOnHandDiff" position="2"><display/></field> @@ -293,7 +311,10 @@ <hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}"/> </field> <field name="inventoryItemId" widget-style="buttontext"> - <hyperlink target="EditInventoryItem?inventoryItemId=${inventoryItemId}&facilityId=${facilityId}" description="${inventoryItemId}"/> + <hyperlink target="EditInventoryItem" description="${inventoryItemId}"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + <parameter param-name="facilityId" from-field="facilityId"/> + </hyperlink> </field> <field name="inventoryItemDetailSeqId"><display/></field> <field name="quantityOnHandDiff"><display/></field> @@ -380,7 +401,10 @@ </service> </row-actions> <field name="items" title="${uiLabelMap.ProductProductId}" widget-style="buttontext"> - <hyperlink target="EditFacilityInventoryItems?productId=${productId}&facilityId=${facilityId}" description="${productId}"/> + <hyperlink target="EditFacilityInventoryItems" description="${productId}"> + <parameter param-name="productId" from-field="productId"/> + <parameter param-name="facilityId" from-field="facilityId"/> + </hyperlink> </field> <field name="productId" title="${uiLabelMap.CommonDescription}"> <display-entity entity-name="Product" description="${internalName}"> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sat Mar 28 19:45:05 2009 @@ -610,7 +610,10 @@ </service> </actions> <field name="communicationEventId"> - <hyperlink description="${communicationEventId}" target="EditWorkEffortCommEvent?communicationEventId=${communicationEventId}&DONE_PAGE=${donePage}" target-type="intra-app"/> + <hyperlink description="${communicationEventId}" target="EditWorkEffortCommEvent" target-type="intra-app"> + <parameter param-name="communicationEventId" from-field="communicationEventId"/> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </hyperlink> </field> <field name="partyIdFrom" title="${uiLabelMap.PartyPartyId} ${uiLabelMap.CommonFrom}"> <display-entity description="${firstName} ${lastName} ${groupName} [${partyId}]" entity-name="PartyNameView" key-field-name="partyId"/> @@ -807,7 +810,10 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deleteWorkEffortTimeEntry?workEffortId=${workEffortId}&timeEntryId=${timeEntryId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteWorkEffortTimeEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="timeEntryId" from-field="timeEntryId"/> + </hyperlink> </field> </form> <form name="AddWorkEffortTimeEntry" type="single" target="createWorkEffortTimeEntry" title="" @@ -857,7 +863,10 @@ </entity-condition> </actions> <field name="noteId"> - <hyperlink target="EditWorkEffortNotes?workEffortId=${workEffortId}&noteId=${noteId}" also-hidden="false" description="${noteId}"/> + <hyperlink target="EditWorkEffortNotes" also-hidden="false" description="${noteId}"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="noteId" from-field="noteId"/> + </hyperlink> </field> <field name="workEffortId" entity-name="WorkEffort" widget-style="buttontext"> <hyperlink target="EditWorkEffort?workEffortId=${workEffortId}" also-hidden="false" description="${workEffortId}"/> @@ -865,7 +874,10 @@ <field name="noteInfo" title="${uiLabelMap.CommonNote}"><display/></field> <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field> <field name="internalNote" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when="internalNote.equals("N")"> - <hyperlink target="updateWorkEffortNote?workEffortId=${workEffortId}&noteId=${noteId}&internalNote=Y" description="${uiLabelMap.OrderNotesPrivate}" /> + <hyperlink target="updateWorkEffortNote" > + <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="noteId" from-field="noteId}&internalNote=Y" description="${uiLabelMap.OrderNotesPrivate"/> + </hyperlink> </field> <field name="internalNote" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when="internalNote.equals("Y")"> <hyperlink target="updateWorkEffortNote?workEffortId=${workEffortId}&noteId=${noteId}&internalNote=N" description="${uiLabelMap.OrderNotesPublic}"/> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortOrderHeaderForms.xml Sat Mar 28 19:45:05 2009 @@ -30,7 +30,10 @@ </actions> <field name="workEffortId"><hidden/></field> <field name="orderId" widget-style="buttontext"> - <hyperlink description="${orderId}" target="/ordermgr/control/orderview?orderId=${orderId}&workEffortId=${workEffortId}" target-type="inter-app"/> + <hyperlink description="${orderId}" target="/ordermgr/control/orderview" target-type="inter-app"> + <parameter param-name="orderId" from-field="orderId"/> + <parameter param-name="workEffortId" from-field="workEffortId"/> + </hyperlink> </field> <field name="statusItemDescription"><display/></field> <field name="orderTypeDescription"><display/></field> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=759562&r1=759561&r2=759562&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sat Mar 28 19:45:05 2009 @@ -428,7 +428,10 @@ <field name="comments"><text size="60"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="deleteTimeEntry?workEffortId=${workEffortId}&timeEntryId=${timeEntryId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteTimeEntry" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="timeEntryId" from-field="timeEntryId"/> + </hyperlink> </field> </form> <form name="createTimeEntry" type="single" target="createTimeEntry" header-row-style="header-row" default-table-style="basic-table"> |
Free forum by Nabble | Edit this page |