You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/04/02 11:14:41 UTC
svn commit: r761214 - in /ofbiz/trunk: applications/accounting/widget/
applications/manufacturing/widget/manufacturing/
applications/order/widget/ordermgr/ applications/product/widget/catalog/
applications/product/widget/facility/ applications/workeffo...
Author: jleroux
Date: Thu Apr 2 09:14:40 2009
New Revision: 761214
URL: http://svn.apache.org/viewvc?rev=761214&view=rev
Log:
Securing URLs, link element in screens and menus : 22th set + tabs to 4 spaces
Modified:
ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
ofbiz/trunk/applications/accounting/widget/GlScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml
ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml
ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Thu Apr 2 09:14:40 2009
@@ -163,7 +163,9 @@
<decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
<decorator-section name="body">
<container style="button-bar">
- <link target="EditAgreementItem?agreementId=${agreement.agreementId}" text="${uiLabelMap.AccountingNewAgreementItem}" style="buttontext"/>
+ <link target="EditAgreementItem" text="${uiLabelMap.AccountingNewAgreementItem}" style="buttontext">
+ <parameter param-name="agreementId" from-field="agreement.agreementId"/>
+ </link>
</container>
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -202,7 +204,9 @@
<decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
<decorator-section name="body">
<container style="button-bar">
- <link target="EditAgreementItem?agreementId=${agreement.agreementId}" text="${uiLabelMap.AccountingNewAgreementItem}" style="buttontext"/>
+ <link target="EditAgreementItem" text="${uiLabelMap.AccountingNewAgreementItem}" style="buttontext">
+ <parameter param-name="agreementId" from-field="agreement.agreementId"/>
+ </link>
</container>
<container style="screenlet">
<container style="screenlet-title-bar">
Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Thu Apr 2 09:14:40 2009
@@ -51,7 +51,9 @@
<parameter param-name="creditGlAccountClassId" from-field="REVENUE"/>
<parameter param-name="acctgTransTypeId" value="SALES"/>
</link>
- <link target="TrialBalance?organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AccountingTrialBalance}" style="buttontext"/>
+ <link target="TrialBalance" text="${uiLabelMap.AccountingTrialBalance}" style="buttontext">
+ <parameter param-name="organizationPartyId" from-field="organizationPartyId"/>
+ </link>
</container>
<container>
<link target="CreateAcctgTransAndEntries" text="${uiLabelMap.AccountingCreatePaymentAcctgTrans}" style="buttontext">
@@ -60,11 +62,15 @@
<parameter param-name="creditGlAccountClassId" from-field="CURRENT_LIABILITY"/>
<parameter param-name="acctgTransTypeId" value="PAYMENT_ACCTG_TRANS"/>
</link>
- <link target="IncomeStatement?organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AccountingIncomeStatement}" style="buttontext"/>
+ <link target="IncomeStatement" text="${uiLabelMap.AccountingIncomeStatement}" style="buttontext">
+ <parameter param-name="organizationPartyId" from-field="organizationPartyId"/>
+ </link>
</container>
<container>
<link text="${uiLabelMap.PageTitleUnpostedTransactions}" style="buttontext" target="ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}"/>
- <link target="BalanceSheet?organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AccountingBalanceSheet}" style="buttontext"/>
+ <link target="BalanceSheet" text="${uiLabelMap.AccountingBalanceSheet}" style="buttontext">
+ <parameter param-name="organizationPartyId" from-field="organizationPartyId"/>
+ </link>
</container>
</container>
</container>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Thu Apr 2 09:14:40 2009
@@ -339,13 +339,17 @@
<widgets>
<container style="lefthalf">
<screenlet title="${uiLabelMap.AccountingPaymentHeader}">
- <link target="editPayment?paymentId=${paymentId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/>
+ <link target="editPayment" text="${uiLabelMap.CommonUpdate}" style="buttontext">
+ <parameter param-name="paymentId" from-field="paymentId"/>
+ </link>
<include-form name="paymentHeader" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
</screenlet>
</container>
<container style="righthalf">
<screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${payment.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${payment.currencyUomId})}">
- <link target="editPaymentApplications?paymentId=${paymentId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/>
+ <link target="editPaymentApplications" text="${uiLabelMap.CommonUpdate}" style="buttontext">
+ <parameter param-name="paymentId" from-field="paymentId"/>
+ </link>
<include-form name="paymentApplications" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
</screenlet>
</container>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Thu Apr 2 09:14:40 2009
@@ -238,13 +238,17 @@
<decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}">
<decorator-section name="body">
<container>
- <link target="PrintProductionRun?productionRunId=${productionRunId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
+ <link target="PrintProductionRun" text="${uiLabelMap.CommonPrint}" style="buttontext">
+ <parameter param-name="productionRunId" from-field="productionRunId"/>
+ </link>
<section>
<condition>
<if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_COMPLETED"/>
</condition>
<widgets>
- <link target="changeProductionRunStatusToClosed?productionRunId=${productionRunId}" text="${uiLabelMap.ManufacturingProductionRunClose}" style="buttontext"/>
+ <link target="changeProductionRunStatusToClosed" text="${uiLabelMap.ManufacturingProductionRunClose}" style="buttontext">
+ <parameter param-name="productionRunId" from-field="productionRunId"/>
+ </link>
</widgets>
</section>
<section>
@@ -256,8 +260,12 @@
</and>
</condition>
<widgets>
- <link target="quickStartAllProductionRunTasks?productionRunId=${productionRunId}" text="${uiLabelMap.ManufacturingQuickStartAllTasks}" style="buttontext"/>
- <link target="quickRunAllProductionRunTasks?productionRunId=${productionRunId}" text="${uiLabelMap.ManufacturingQuickRunAllTasks}" style="buttontext"/>
+ <link target="quickStartAllProductionRunTasks" text="${uiLabelMap.ManufacturingQuickStartAllTasks}" style="buttontext">
+ <parameter param-name="productionRunId" from-field="productionRunId"/>
+ </link>
+ <link target="quickRunAllProductionRunTasks" text="${uiLabelMap.ManufacturingQuickRunAllTasks}" style="buttontext">
+ <parameter param-name="productionRunId" from-field="productionRunId"/>
+ </link>
<link target="quickChangeProductionRunStatus" text="${uiLabelMap.ManufacturingQuickComplete}" style="buttontext">
<parameter param-name="productionRunId" from-field="productionRunId"/>
<parameter param-name="statusId" value="PRUN_COMPLETED"/>
@@ -266,7 +274,9 @@
<parameter param-name="productionRunId" from-field="productionRunId"/>
<parameter param-name="statusId" value="PRUN_CLOSED"/>
</link>
- <link target="cancelProductionRun?productionRunId=${productionRunId}" text="${uiLabelMap.ManufacturingCancel}" style="buttontext"/>
+ <link target="cancelProductionRun" text="${uiLabelMap.ManufacturingCancel}" style="buttontext">
+ <parameter param-name="productionRunId" from-field="productionRunId"/>
+ </link>
</widgets>
</section>
</container>
Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Thu Apr 2 09:14:40 2009
@@ -318,7 +318,9 @@
<decorator-screen name="CommonRoutingTaskDecorator">
<decorator-section name="body">
<screenlet id="EditRoutingTaskProductPanel" title="${uiLabelMap.PageTitleListRoutingTaskProducts}">
- <link target="EditRoutingTaskProduct?workEffortId=${workEffortId}" text="${uiLabelMap.ManufacturingNewRoutingTaskProduct}" style="buttontext"/>
+ <link target="EditRoutingTaskProduct" text="${uiLabelMap.ManufacturingNewRoutingTaskProduct}" style="buttontext">
+ <parameter param-name="workEffortId" from-field="workEffortId"/>
+ </link>
<include-form name="ListRoutingTaskProducts" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/>
</screenlet>
</decorator-section>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Thu Apr 2 09:14:40 2009
@@ -85,7 +85,9 @@
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
- <link target="QuoteReport?quoteId=${quote.quoteId}" text="${uiLabelMap.CommonReports}" style="buttontext"/>
+ <link target="QuoteReport" text="${uiLabelMap.CommonReports}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
<link target="EditQuoteReportMail" text="${uiLabelMap.CommonSendReportByMail}" style="buttontext">
<parameter param-name="quoteId" from-field="quote.quoteId"/>
<parameter param-name="emailType" value="PRDS_QUO_CONFIRM"/>
@@ -270,7 +272,9 @@
<section>
<widgets>
<container>
- <link target="EditQuoteRole?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext"/>
+ <link target="EditQuoteRole" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
<include-form name="ListQuoteRoles" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
</widgets>
@@ -308,7 +312,9 @@
<section>
<widgets>
<container>
- <link target="EditQuoteRole?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext"/>
+ <link target="EditQuoteRole" text="${uiLabelMap.OrderCreateOrderQuoteRole}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
<include-form name="EditQuoteRole" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
</widgets>
@@ -349,7 +355,9 @@
<section>
<widgets>
<container>
- <link target="EditQuoteItem?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteItem}" style="buttontext"/>
+ <link target="EditQuoteItem" text="${uiLabelMap.OrderCreateOrderQuoteItem}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
<include-form name="ListQuoteItems" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
</widgets>
@@ -387,7 +395,9 @@
<section>
<widgets>
<container>
- <link target="EditQuoteItem?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteItem}" style="buttontext"/>
+ <link target="EditQuoteItem" text="${uiLabelMap.OrderCreateOrderQuoteItem}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
<include-form name="EditQuoteItem" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
</widgets>
@@ -424,7 +434,9 @@
<section>
<widgets>
<container>
- <link target="EditQuoteAttribute?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext"/>
+ <link target="EditQuoteAttribute" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
<include-form name="ListQuoteAttributes" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
</widgets>
@@ -462,7 +474,9 @@
<section>
<widgets>
<container>
- <link target="EditQuoteAttribute?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext"/>
+ <link target="EditQuoteAttribute" text="${uiLabelMap.OrderCreateOrderQuoteAttribute}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
<include-form name="EditQuoteAttribute" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
</widgets>
@@ -499,7 +513,9 @@
<section>
<widgets>
<container>
- <link target="EditQuoteCoefficient?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext"/>
+ <link target="EditQuoteCoefficient" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
<include-form name="ListQuoteCoefficients" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
</widgets>
@@ -537,7 +553,9 @@
<section>
<widgets>
<container>
- <link target="EditQuoteCoefficient?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext"/>
+ <link target="EditQuoteCoefficient" text="${uiLabelMap.OrderCreateOrderQuoteCoefficient}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
<include-form name="EditQuoteCoefficient" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
</widgets>
@@ -641,8 +659,12 @@
<section>
<widgets>
<container>
- <link target="autoCreateQuoteAdjustments?quoteId=${quoteId}" text="${uiLabelMap.OrderRunStorePromotions}" style="buttontext"/>
- <link target="EditQuoteAdjustment?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteAdjustment}" style="buttontext"/>
+ <link target="autoCreateQuoteAdjustments" text="${uiLabelMap.OrderRunStorePromotions}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quoteId"/>
+ </link>
+ <link target="EditQuoteAdjustment" text="${uiLabelMap.OrderCreateOrderQuoteAdjustment}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
<include-form name="ListQuoteAdjustments" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
</widgets>
@@ -680,7 +702,9 @@
<section>
<widgets>
<container>
- <link target="EditQuoteAdjustment?quoteId=${quote.quoteId}" text="${uiLabelMap.OrderCreateOrderQuoteAdjustment}" style="buttontext"/>
+ <link target="EditQuoteAdjustment" text="${uiLabelMap.OrderCreateOrderQuoteAdjustment}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
</container>
<include-form name="EditQuoteAdjustment" location="component://order/webapp/ordermgr/quote/QuoteForms.xml"/>
</widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml Thu Apr 2 09:14:40 2009
@@ -116,7 +116,9 @@
<section>
<widgets>
<container>
- <link target="AddQuoteWorkEffort?quoteId=${quoteId}" text="${uiLabelMap.OrderCreateQuoteWorkEffort}" style="buttontext"/>
+ <link target="AddQuoteWorkEffort" text="${uiLabelMap.OrderCreateQuoteWorkEffort}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quoteId"/>
+ </link>
</container>
<include-form name="ListQuoteWorkEfforts" location="component://order/widget/ordermgr/QuoteWorkEffortForms.xml"/>
</widgets>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Thu Apr 2 09:14:40 2009
@@ -190,7 +190,9 @@
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleRequestItems}">
- <link target="requestitem?custRequestId=${custRequestId}" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext"/>
+ <link target="requestitem" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext">
+ <parameter param-name="custRequestId" from-field="custRequestId"/>
+ </link>
<include-form name="ListRequestItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
</decorator-section>
@@ -225,7 +227,9 @@
<section>
<widgets>
<container>
- <link target="requestitem?custRequestId=${custRequestId}" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext"/>
+ <link target="requestitem" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext">
+ <parameter param-name="custRequestId" from-field="custRequestId"/>
+ </link>
</container>
<include-form name="EditCustRequestItem" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
<platform-specific>
@@ -465,7 +469,9 @@
<decorator-screen name="CommonRequestDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet id="AddCustRequestItemWorkEffortPanel" title="${uiLabelMap.CommonId}:${custRequestItem.custRequestItemSeqId} ${custRequestItem.description}" collapsible="true">
- <link target="EditRequestItem?custRequestId=${custRequestId}" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext"/>
+ <link target="EditRequestItem" text="${uiLabelMap.OrderNewRequestItem}" style="buttontext">
+ <parameter param-name="custRequestId" from-field="custRequestId"/>
+ </link>
<include-form name="AddCustRequestItemWorkEffort" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
<include-form name="ListCustRequestItemWorkEfforts" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Thu Apr 2 09:14:40 2009
@@ -420,8 +420,12 @@
<section>
<widgets>
<container>
- <link target="EditRequirementRole?requirementId=${requirementId}" text="${uiLabelMap.CommonNew}" style="buttontext"/>
- <link target="autoAssignRequirementToSupplier?requirementId=${requirementId}" text="${uiLabelMap.OrderAutoAssign}" style="buttontext"/>
+ <link target="EditRequirementRole" text="${uiLabelMap.CommonNew}" style="buttontext">
+ <parameter param-name="requirementId" from-field="requirementId"/>
+ </link>
+ <link target="autoAssignRequirementToSupplier" text="${uiLabelMap.OrderAutoAssign}" style="buttontext">
+ <parameter param-name="requirementId" from-field="requirementId"/>
+ </link>
</container>
<include-form name="ListRequirementRoles" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
</widgets>
Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Thu Apr 2 09:14:40 2009
@@ -46,9 +46,15 @@
<container>
<link target="EditCategory" text="${uiLabelMap.ProductNewCategory}" style="buttontext"/>
- <link target="createProductInCategoryStart?productCategoryId=${productCategoryId}" text="${uiLabelMap.ProductCreateProductInCategory}" style="buttontext"/>
- <link target="advancedsearch?SEARCH_CATEGORY_ID=${productCategoryId}" text="${uiLabelMap.ProductSearchInCategory}" style="buttontext"/>
- <link target="/ecommerce/control/category?category_id=${productCategoryId}" url-mode="plain" text="${uiLabelMap.ProductCategoryPage}" style="buttontext"/>
+ <link target="createProductInCategoryStart" text="${uiLabelMap.ProductCreateProductInCategory}" style="buttontext">
+ <parameter param-name="productCategoryId" from-field="productCategoryId"/>
+ </link>
+ <link target="advancedsearch" text="${uiLabelMap.ProductSearchInCategory}" style="buttontext">
+ <parameter param-name="SEARCH_CATEGORY_ID" from-field="productCategoryId"/>
+ </link>
+ <link target="/ecommerce/control/category" url-mode="plain" text="${uiLabelMap.ProductCategoryPage}" style="buttontext">
+ <parameter param-name="category_id" from-field="productCategoryId"/>
+ </link>
</container>
</widgets>
</section>
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Thu Apr 2 09:14:40 2009
@@ -84,7 +84,9 @@
<container style="button-bar">
<link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/>
<link target="CreateVirtualWithVariantsForm" text="${uiLabelMap.ProductNewVirtualProduct}" style="buttontext"/>
- <link target="/ecommerce/control/product?product_id=${productId}" url-mode="inter-app" text="${uiLabelMap.ProductProductPage}" style="buttontext"/>
+ <link target="/ecommerce/control/product" url-mode="inter-app" text="${uiLabelMap.ProductProductPage}" style="buttontext">
+ <parameter param-name="product_id" from-field="productId"/>
+ </link>
<link target="ProductBarCode.pdf" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext">
<parameter param-name="productId" from-field="productId"/>
<parameter param-name="productName" from-field="productName"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Thu Apr 2 09:14:40 2009
@@ -378,7 +378,9 @@
</container>
<container style="screenlet-body">
<container>
- <link target="newFixedAssetProduct?productId=${productId}" text="${uiLabelMap.PageTitleCreateProductAssetUsage}" style="buttontext"/>
+ <link target="newFixedAssetProduct" text="${uiLabelMap.PageTitleCreateProductAssetUsage}" style="buttontext">
+ <parameter param-name="productId" from-field="productId"/>
+ </link>
</container>
<section>
<widgets>
@@ -414,7 +416,9 @@
</container>
<container style="screenlet-body">
<container>
- <link target="newFixedAssetProduct?productId=${productId}" text="${uiLabelMap.AccountingFixedAssetNew}" style="buttontext"/>
+ <link target="newFixedAssetProduct" text="${uiLabelMap.AccountingFixedAssetNew}" style="buttontext">
+ <parameter param-name="productId" from-field="productId"/>
+ </link>
</container>
<section>
<widgets>
@@ -801,8 +805,12 @@
<decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
- <link target="forceIndexProductKeywords?productId=${productId}" text="${uiLabelMap.ProductReInduceKeywords}" style="buttontext"/>
- <link target="deleteProductKeywords?productId=${productId}" text="${uiLabelMap.ProductDeleteAllKeywords}" style="buttontext"/>
+ <link target="forceIndexProductKeywords" text="${uiLabelMap.ProductReInduceKeywords}" style="buttontext">
+ <parameter param-name="productId" from-field="productId"/>
+ </link>
+ <link target="deleteProductKeywords" text="${uiLabelMap.ProductDeleteAllKeywords}" style="buttontext">
+ <parameter param-name="productId" from-field="productId"/>
+ </link>
</container>
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -1186,7 +1194,11 @@
</container>
<section>
<condition><not><if-empty field="supplierProduct"/></not></condition>
- <widgets><link target="EditProductSuppliers?productId=${productId}" style="buttontext" text="${uiLabelMap.ProductNewProductSupplier}"/></widgets>
+ <widgets>
+ <link target="EditProductSuppliers" style="buttontext" text="${uiLabelMap.ProductNewProductSupplier}">
+ <parameter param-name="productId" from-field="productId"/>
+ </link>
+ </widgets>
</section>
<container style="screenlet">
<container style="screenlet-title-bar">
Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Thu Apr 2 09:14:40 2009
@@ -277,7 +277,9 @@
<decorator-screen name="CommonPromoDecorator">
<decorator-section name="body">
<container>
- <link target="EditProductPromoCode?productPromoId=${productPromoId}" text="${uiLabelMap.ProductNewPromotionCode}" style="buttontext"/>
+ <link target="EditProductPromoCode" text="${uiLabelMap.ProductNewPromotionCode}" style="buttontext">
+ <parameter param-name="productPromoId" from-field="productPromoId"/>
+ </link>
</container>
<section>
<condition>
@@ -285,12 +287,16 @@
</condition>
<widgets>
<container>
- <link target="FindProductPromoCode?manualOnly=N&productPromoId=${productPromoId}" text="${uiLabelMap.ProductPromotionManualImported}" style="buttontext"/>
+ <link target="FindProductPromoCode" text="${uiLabelMap.ProductPromotionManualImported}" style="buttontext">
+ <parameter param-name="manualOnly=N&productPromoId" from-field="productPromoId"/>
+ </link>
</container>
</widgets>
<fail-widgets>
<container>
- <link target="FindProductPromoCode?manualOnly=Y&productPromoId=${productPromoId}" text="${uiLabelMap.ProductPromotionManual}" style="buttontext"/>
+ <link target="FindProductPromoCode" text="${uiLabelMap.ProductPromotionManual}" style="buttontext">
+ <parameter param-name="manualOnly=Y&productPromoId" from-field="productPromoId"/>
+ </link>
</container>
</fail-widgets>
</section>
Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Thu Apr 2 09:14:40 2009
@@ -141,7 +141,9 @@
<decorator-section name="body">
<container>
<label style="h3">${uiLabelMap.CommonView}</label>
- <link target="EditProductStorePromos?productStoreId=${productStoreId}" text="${uiLabelMap.CommonAll}" style="buttontext"/>
+ <link target="EditProductStorePromos" text="${uiLabelMap.CommonAll}" style="buttontext">
+ <parameter param-name="productStoreId" from-field="productStoreId"/>
+ </link>
<link target="EditProductStorePromos" text="${uiLabelMap.CommonUserEnteredOnly}" style="buttontext">
<parameter param-name="productStoreId" from-field="productStoreId"/>
<parameter param-name="userEntered" value="Y"/>
@@ -641,7 +643,9 @@
<decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
- <link target="/marketing/control/viewSegmentGroup?productStoreId=${productStoreId}" text="${uiLabelMap.ProductNewSegment}" style="buttontext" url-mode="inter-app"/>
+ <link target="/marketing/control/viewSegmentGroup" style="buttontext" url-mode="inter-app">
+ <parameter param-name="productStoreId" from-field="productStoreId}" text="${uiLabelMap.ProductNewSegment"/>
+ </link>
</container>
<container style="screenlet">
<container style="screenlet-title-bar">
Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Thu Apr 2 09:14:40 2009
@@ -208,7 +208,9 @@
<container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} "${subscriptionResource.description}" [${subscriptionResourceId}]</label></container>
<container style="button-bar">
<link target="EditSubscriptionResource" text="${uiLabelMap.ProductNewSubscriptionResource}" style="buttontext"/>
- <link target="FindSubscription?subscriptionResourceId=${subscriptionResourceId}" text="${uiLabelMap.ProductFindResourceSubscriptions}" style="buttontext"/>
+ <link target="FindSubscription" text="${uiLabelMap.ProductFindResourceSubscriptions}" style="buttontext">
+ <parameter param-name="subscriptionResourceId" from-field="subscriptionResourceId"/>
+ </link>
</container>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Thu Apr 2 09:14:40 2009
@@ -215,7 +215,9 @@
<parameter param-name="facilityId" from-field="facilityId"/>
<parameter param-name="completeRequested" value="true"/>
</link>
- <link target="TransferInventoryItem?facilityId=${facilityId}" text="${uiLabelMap.ProductInventoryTransfer}" style="buttontext"/>
+ <link target="TransferInventoryItem" text="${uiLabelMap.ProductInventoryTransfer}" style="buttontext">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ </link>
</container>
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -324,8 +326,12 @@
<decorator-section name="menu-bar">
<container style="button-bar">
<link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
- <link target="EditInventoryItem?facilityId=${parameters.facilityId}" text="${uiLabelMap.ProductNewInventoryItem}" style="buttontext"/>
- <link target="SearchInventoryItemsByLabels?facilityId=${parameters.facilityId}" text="${uiLabelMap.ProductSearchInventoryItemsByLabels}" style="buttontext"/>
+ <link target="EditInventoryItem" text="${uiLabelMap.ProductNewInventoryItem}" style="buttontext">
+ <parameter param-name="facilityId" from-field="parameters.facilityId"/>
+ </link>
+ <link target="SearchInventoryItemsByLabels" text="${uiLabelMap.ProductSearchInventoryItemsByLabels}" style="buttontext">
+ <parameter param-name="facilityId" from-field="parameters.facilityId"/>
+ </link>
</container>
</decorator-section>
<decorator-section name="search-options">
@@ -363,8 +369,12 @@
</container>
<container>
<link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
- <link target="EditInventoryItem?facilityId=${parameters.facilityId}" text="${uiLabelMap.ProductCreateNewInventoryItemFacility}" style="buttontext"/>
- <link target="EditFacilityInventoryItems?facilityId=${parameters.facilityId}" text="${uiLabelMap.ProductInventoryItems}" style="buttontext"/>
+ <link target="EditInventoryItem" text="${uiLabelMap.ProductCreateNewInventoryItemFacility}" style="buttontext">
+ <parameter param-name="facilityId" from-field="parameters.facilityId"/>
+ </link>
+ <link target="EditFacilityInventoryItems" text="${uiLabelMap.ProductInventoryItems}" style="buttontext">
+ <parameter param-name="facilityId" from-field="parameters.facilityId"/>
+ </link>
</container>
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -418,7 +428,9 @@
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar">
- <!--<link target="ViewFacilityInventoryByProductSimple?facilityId=${facilityId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>-->
+ <!--<link target="ViewFacilityInventoryByProductSimple" text="${uiLabelMap.CommonPrint}" style="buttontext">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ </link>-->
<link target="ViewFacilityInventoryByProductReport?${searchParameterString}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
<link target="ViewFacilityInventoryByProductExport?${searchParameterString}" text="${uiLabelMap.CommonExport}" style="buttontext"/>
<link target="InventoryItemTotals" text="${uiLabelMap.ProductInventoryItemTotals}" style="buttontext">
@@ -433,7 +445,9 @@
<parameter param-name="facilityId" from-field="facilityId"/>
<parameter param-name="action" value="Y"/>
</link>
- <link target="InventoryAverageCosts?facilityId=${facilityId}" text="${uiLabelMap.ProductInventoryAverageCosts}" style="buttontext"/>
+ <link target="InventoryAverageCosts" text="${uiLabelMap.ProductInventoryAverageCosts}" style="buttontext">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ </link>
</container>
</decorator-section>
<decorator-section name="search-options">
@@ -486,7 +500,9 @@
<label style="h2">${facility.facilityName} [${uiLabelMap.CommonId}:${facilityId}]</label>
</container>
<container>
- <link target="ViewFacilityInventoryByProduct?facilityId=${facilityId}" text="${uiLabelMap.CommonBack}" style="buttontext"/>
+ <link target="ViewFacilityInventoryByProduct" text="${uiLabelMap.CommonBack}" style="buttontext">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ </link>
</container>
<include-form name="FindFacilityInventoryByProduct" location="component://product/webapp/facility/facility/FacilityForms.xml"/>
@@ -914,7 +930,9 @@
<label text="${uiLabelMap.PageTitleEditInventoryItem}"/>
</container>
<container style="widget-container">
- <link target="EditInventoryItem?facilityId=${facilityId}" text="${uiLabelMap.ProductNewInventoryItem}" style="buttontext"/>
+ <link target="EditInventoryItem" text="${uiLabelMap.ProductNewInventoryItem}" style="buttontext">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ </link>
<link target="TransferInventoryItem" text="${uiLabelMap.ProductTransferItem}" style="buttontext">
<parameter param-name="inventoryItemId" from-field="inventoryItemId"/>
<parameter param-name="facilityId" from-field="facilityId"/>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityTrees.xml Thu Apr 2 09:14:40 2009
@@ -31,7 +31,9 @@
</sub-node>
</node>
<node name="node-body">
- <link target="EditFacility?facilityId=${facilityId}" text="${facilityName} [${facilityId}]"/>
+ <link target="EditFacility" text="${facilityName} [${facilityId}]">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ </link>
<sub-node node-name="node-body">
<entity-and entity-name="Facility">
<field-map field-name="parentFacilityId" from-field="facilityId"/>
Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml Thu Apr 2 09:14:40 2009
@@ -81,7 +81,11 @@
<label style="tabletext" text="${currentTimeEntry.comments} [${currentRateType.description}]"/>
<section>
<condition><not><if-empty field="currentTimeEntry.workEffortId"/></not></condition>
- <widgets><link target="WorkEffortSummary?workEffortId=${currentTimeEntry.workEffortId}" text="${uiLabelMap.WorkEffortWorkEffort}: ${currentTimeEntry.workEffortId}" style="buttontext"/></widgets>
+ <widgets>
+ <link target="WorkEffortSummary" text="${uiLabelMap.WorkEffortWorkEffort}: ${currentTimeEntry.workEffortId}" style="buttontext">
+ <parameter param-name="workEffortId" from-field="currentTimeEntry.workEffortId"/>
+ </link>
+ </widgets>
</section>
</container>
</widgets>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml Thu Apr 2 09:14:40 2009
@@ -104,7 +104,9 @@
<section>
<widgets>
<container>
- <link target="/partymgr/control/EditCommunicationEvent?communicationEventId=${commEvent.communicationEventId}" url-mode="inter-app" text="${commEvent.communicationEventId}" style="buttontext"/>
+ <link target="/partymgr/control/EditCommunicationEvent" url-mode="inter-app" text="${commEvent.communicationEventId}" style="buttontext">
+ <parameter param-name="communicationEventId" from-field="commEvent.communicationEventId"/>
+ </link>
<label text="${commEvent.subject}"/>
</container>
</widgets>
@@ -125,7 +127,9 @@
<section>
<widgets>
<container>
- <link target="/partymgr/control/editShoppingList?shoppingListId=${shopList.shoppingListId}" url-mode="inter-app" text="${shopList.shoppingListId}" style="buttontext"/>
+ <link target="/partymgr/control/editShoppingList" url-mode="inter-app" text="${shopList.shoppingListId}" style="buttontext">
+ <parameter param-name="shoppingListId" from-field="shopList.shoppingListId"/>
+ </link>
<label text="${shopList.listName} ${shopList.description}"/>
</container>
</widgets>
@@ -146,7 +150,9 @@
<section>
<widgets>
<container>
- <link target="/ordermgr/control/EditQuote?quoteId=${quote.quoteId}" url-mode="inter-app" text="${quote.quoteId}" style="buttontext"/>
+ <link target="/ordermgr/control/EditQuote" url-mode="inter-app" text="${quote.quoteId}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
<label text="${quote.quoteName} ${quote.description}"/>
</container>
</widgets>
@@ -167,7 +173,9 @@
<section>
<widgets>
<container>
- <link target="/ordermgr/control/orderview?orderId=${orderHeader.orderId}" url-mode="inter-app" text="${orderHeader.orderId}" style="buttontext"/>
+ <link target="/ordermgr/control/orderview" url-mode="inter-app" text="${orderHeader.orderId}" style="buttontext">
+ <parameter param-name="orderId" from-field="orderHeader.orderId"/>
+ </link>
<label text="${uiLabelMap.CommonType} " style="label"/><label text="${orderHeader.orderTypeDescription}"/>
<label text="${uiLabelMap.CommonStatus} " style="label"/><label text="${orderHeader.statusItemDescription}"/>
<label text="${uiLabelMap.CommonTotal} " style="label"/><label text="${orderHeader.grandTotal}"/>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Thu Apr 2 09:14:40 2009
@@ -272,7 +272,9 @@
</actions>
<widgets>
<label text=" ${workEffort.workEffortName} - ${workEffort.description}" style="tabletext"/>
- <link target="EditWorkEffort?workEffortId=${workEffort.workEffortId}" text="${workEffort.workEffortId}" style="buttontext"/>
+ <link target="EditWorkEffort" text="${workEffort.workEffortId}" style="buttontext">
+ <parameter param-name="workEffortId" from-field="workEffort.workEffortId"/>
+ </link>
<link target="AddWorkEffortAndAssoc?workEffortIdFrom=${workEffort.workEffortId}" text="${uiLabelMap.WorkEffortAddChild}" style="buttontext"></link>
<link target="AddWorkEffortAssoc?workEffortIdFrom=${workEffort.workEffortId}" text="${uiLabelMap.WorkEffortAddExistingWorkEffortChild}" style="buttontext"></link>
<section>
Modified: ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/CommonScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/CommonScreens.xml Thu Apr 2 09:14:40 2009
@@ -95,8 +95,12 @@
<container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${example.exampleName} [${exampleId}]</label></container>
<container style="button-bar">
<link target="EditExample" text="${uiLabelMap.ExampleNewExample}" style="buttontext"/>
- <link target="ExampleReportHtml?exampleId=${exampleId}" text="${uiLabelMap.CommonPrinterFriendly}" style="buttontext"/>
- <link target="ExampleReportPdf?exampleId=${exampleId}" text="${uiLabelMap.CommonPdf}" style="buttontext"/>
+ <link target="ExampleReportHtml" text="${uiLabelMap.CommonPrinterFriendly}" style="buttontext">
+ <parameter param-name="exampleId" from-field="exampleId"/>
+ </link>
+ <link target="ExampleReportPdf" text="${uiLabelMap.CommonPdf}" style="buttontext">
+ <parameter param-name="exampleId" from-field="exampleId"/>
+ </link>
<link target="help?topic=ExampleEditHelp" text="${uiLabelMap.CommonHelp}" style="buttontext" target-window="_blank"/>
</container>
</widgets>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Thu Apr 2 09:14:40 2009
@@ -121,7 +121,9 @@
<condition><not><if-empty field="maintHistSeqId"/></not></condition>
<widgets>
<container style="button-bar">
- <link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/>
+ <link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext">
+ <parameter param-name="fixedAssetId" from-field="fixedAssetId"/>
+ </link>
<link target="printFixedAssetMaint.pdf" text="${uiLabelMap.CommonPrint}" style="buttontext">
<parameter param-name="fixedAssetId" from-field="fixedAssetId"/>
<parameter param-name="maintHistSeqId" from-field="maintHistSeqId"/>
@@ -154,7 +156,9 @@
</condition>
<widgets>
<container style="button-bar">
- <link target="EditWorkEfforts?workEffortId=${parameters.workEffortIdFrom}" text="${uiLabelMap.AssetMaintParentWorkEffort}" style="buttontext"/>
+ <link target="EditWorkEfforts" text="${uiLabelMap.AssetMaintParentWorkEffort}" style="buttontext">
+ <parameter param-name="workEffortId" from-field="parameters.workEffortIdFrom"/>
+ </link>
</container>
</widgets>
</section>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml Thu Apr 2 09:14:40 2009
@@ -53,8 +53,12 @@
<label style="h2">${facility.facilityName} [${uiLabelMap.CommonId}:${facilityId}]</label>
</container>
<container>
- <link target="EditFacilityInventoryItems?facilityId=${facilityId}" text="${uiLabelMap.ProductInventoryItems}" style="buttontext"/>
- <!--<link target="ViewFacilityInventoryByProductSimple?facilityId=${facilityId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>-->
+ <link target="EditFacilityInventoryItems" text="${uiLabelMap.ProductInventoryItems}" style="buttontext">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ </link>
+ <!--<link target="ViewFacilityInventoryByProductSimple" text="${uiLabelMap.CommonPrint}" style="buttontext">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ </link>-->
<link target="ViewFacilityInventoryByProductReport?${searchParameterString}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
<link target="ViewFacilityInventoryByProductExport?${searchParameterString}" text="${uiLabelMap.CommonExport}" style="buttontext"/>
</container>
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Thu Apr 2 09:14:40 2009
@@ -72,7 +72,9 @@
<container style="button-bar">
<link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/>
<link target="CreateVirtualWithVariantsForm" text="${uiLabelMap.ProductNewVirtualProduct}" style="buttontext"/>
- <link target="/ecommerce/control/product?product_id=${productId}" url-mode="inter-app" text="${uiLabelMap.ProductProductPage}" style="buttontext"/>
+ <link target="/ecommerce/control/product" url-mode="inter-app" text="${uiLabelMap.ProductProductPage}" style="buttontext">
+ <parameter param-name="product_id" from-field="productId"/>
+ </link>
<link target="ProductBarCode.pdf" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext">
<parameter param-name="productId" from-field="productId"/>
<parameter param-name="productName" from-field="productName"/>
Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Thu Apr 2 09:14:40 2009
@@ -101,7 +101,9 @@
<container style="button-bar">
<link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/>
<link target="CreateVirtualWithVariantsForm" text="${uiLabelMap.ProductNewVirtualProduct}" style="buttontext"/>
- <link target="/ecommerce/control/product?product_id=${productId}" url-mode="inter-app" text="${uiLabelMap.ProductProductPage}" style="buttontext"/>
+ <link target="/ecommerce/control/product" url-mode="inter-app" text="${uiLabelMap.ProductProductPage}" style="buttontext">
+ <parameter param-name="product_id" from-field="productId"/>
+ </link>
<link target="ProductBarCode.pdf" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext">
<parameter param-name="productId" from-field="productId"/>
<parameter param-name="productName" from-field="productName"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=761214&r1=761213&r2=761214&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Thu Apr 2 09:14:40 2009
@@ -131,7 +131,9 @@
<include-form name="ViewRequestWorkEfforts" location="component://projectmgr/widget/forms/RequestForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.CommonContent}" navigation-form-name="ListCustRequestContent">
- <link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}" text="${uiLabelMap.CommonNew} ${uiLabelMap.ContentContent}"/>
+ <link target="EditCustRequestContent" text="${uiLabelMap.CommonNew} ${uiLabelMap.ContentContent}">
+ <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
+ </link>
<include-form name="ListCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
</container>