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/01 19:28:04 UTC
svn commit: r760973 - in /ofbiz/trunk: applications/accounting/widget/
applications/manufacturing/widget/manufacturing/
applications/order/widget/ordermgr/ applications/product/widget/catalog/
applications/product/widget/facility/ specialpurpose/projec...
Author: jleroux
Date: Wed Apr 1 17:28:03 2009
New Revision: 760973
URL: http://svn.apache.org/viewvc?rev=760973&view=rev
Log:
Securing URLs, link element in screens and menus : 14th set + tabs to 4 spaces
+ fix a bug introduced in ProjectScreens.xml in previous commit (workEffortTypeId was missing)
Modified:
ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/GlScreens.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=760973&r1=760972&r2=760973&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Wed Apr 1 17:28:03 2009
@@ -88,7 +88,10 @@
</actions>
<widgets>
<screenlet title="${uiLabelMap.PageTitleFindBillingAccount}">
- <link target="EditBillingAccount?partyId=${parameters.partyId}&roleTypeId=BILL_TO_CUSTOMER" text="${uiLabelMap.CommonNew} " style="buttontext"/>
+ <link target="EditBillingAccount" text="${uiLabelMap.CommonNew} " style="buttontext">
+ <parameter param-name="partyId" from-field="parameters.partyId"/>
+ <parameter param-name="roleTypeId" value="BILL_TO_CUSTOMER"/>
+ </link>
<include-form name="ListBillingAccountsByParty" location="component://accounting/widget/BillingAccountForms.xml"/>
</screenlet>
</widgets>
Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=760973&r1=760972&r2=760973&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Wed Apr 1 17:28:03 2009
@@ -45,11 +45,21 @@
</container>
<container style="screenlet-body">
<container>
- <link target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}&debitGlAccountClassId=CURRENT_ASSET&creditGlAccountClassId=REVENUE&acctgTransTypeId=SALES" text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" style="buttontext"/>
+ <link target="CreateAcctgTransAndEntries" text="${uiLabelMap.AccountingCreateSalesAcctgTrans}" style="buttontext">
+ <parameter param-name="organizationPartyId" from-field="organizationPartyId"/>
+ <parameter param-name="debitGlAccountClassId" from-field="CURRENT_ASSET"/>
+ <parameter param-name="creditGlAccountClassId" from-field="REVENUE"/>
+ <parameter param-name="acctgTransTypeId" value="SALES"/>
+ </link>
<link target="TrialBalance?organizationPartyId=${organizationPartyId}" text="${uiLabelMap.AccountingTrialBalance}" style="buttontext"/>
</container>
<container>
- <link target="CreateAcctgTransAndEntries?organizationPartyId=${organizationPartyId}&debitGlAccountClassId=CASH_EQUIVALENT&creditGlAccountClassId=CURRENT_LIABILITY&acctgTransTypeId=PAYMENT_ACCTG_TRANS" text="${uiLabelMap.AccountingCreatePaymentAcctgTrans}" style="buttontext"/>
+ <link target="CreateAcctgTransAndEntries" text="${uiLabelMap.AccountingCreatePaymentAcctgTrans}" style="buttontext">
+ <parameter param-name="organizationPartyId" from-field="organizationPartyId"/>
+ <parameter param-name="debitGlAccountClassId" from-field="CASH_EQUIVALENT"/>
+ <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"/>
</container>
<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=760973&r1=760972&r2=760973&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Wed Apr 1 17:28:03 2009
@@ -258,8 +258,14 @@
<widgets>
<link target="quickStartAllProductionRunTasks?productionRunId=${productionRunId}" text="${uiLabelMap.ManufacturingQuickStartAllTasks}" style="buttontext"/>
<link target="quickRunAllProductionRunTasks?productionRunId=${productionRunId}" text="${uiLabelMap.ManufacturingQuickRunAllTasks}" style="buttontext"/>
- <link target="quickChangeProductionRunStatus?productionRunId=${productionRunId}&statusId=PRUN_COMPLETED" text="${uiLabelMap.ManufacturingQuickComplete}" style="buttontext"/>
- <link target="quickChangeProductionRunStatus?productionRunId=${productionRunId}&statusId=PRUN_CLOSED" text="${uiLabelMap.ManufacturingQuickClose}" style="buttontext"/>
+ <link target="quickChangeProductionRunStatus" text="${uiLabelMap.ManufacturingQuickComplete}" style="buttontext">
+ <parameter param-name="productionRunId" from-field="productionRunId"/>
+ <parameter param-name="statusId" value="PRUN_COMPLETED"/>
+ </link>
+ <link target="quickChangeProductionRunStatus" text="${uiLabelMap.ManufacturingQuickClose}" style="buttontext">
+ <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"/>
</widgets>
</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=760973&r1=760972&r2=760973&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Wed Apr 1 17:28:03 2009
@@ -86,7 +86,10 @@
<decorator-section name="body">
<container>
<link target="QuoteReport?quoteId=${quote.quoteId}" text="${uiLabelMap.CommonReports}" style="buttontext"/>
- <link target="EditQuoteReportMail?quoteId=${quote.quoteId}&emailType=PRDS_QUO_CONFIRM" text="${uiLabelMap.CommonSendReportByMail}" style="buttontext"/>
+ <link target="EditQuoteReportMail" text="${uiLabelMap.CommonSendReportByMail}" style="buttontext">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ <parameter param-name="emailType" value="PRDS_QUO_CONFIRM"/>
+ </link>
</container>
<platform-specific>
<html><html-template location="component://order/webapp/ordermgr/quote/CreateOrderQuote.ftl"/></html>
Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=760973&r1=760972&r2=760973&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Wed Apr 1 17:28:03 2009
@@ -142,14 +142,31 @@
<container>
<label style="h3">${uiLabelMap.CommonView}</label>
<link target="EditProductStorePromos?productStoreId=${productStoreId}" text="${uiLabelMap.CommonAll}" style="buttontext"/>
- <link target="EditProductStorePromos?productStoreId=${productStoreId}&userEntered=Y" text="${uiLabelMap.CommonUserEnteredOnly}" style="buttontext"/>
- <link target="EditProductStorePromos?productStoreId=${productStoreId}&userEntered=N" text="${uiLabelMap.ProductPromotionImported}" style="buttontext"/>
+ <link target="EditProductStorePromos" text="${uiLabelMap.CommonUserEnteredOnly}" style="buttontext">
+ <parameter param-name="productStoreId" from-field="productStoreId"/>
+ <parameter param-name="userEntered" value="Y"/>
+ </link>
+ <link target="EditProductStorePromos" text="${uiLabelMap.ProductPromotionImported}" style="buttontext">
+ <parameter param-name="productStoreId" from-field="productStoreId"/>
+ <parameter param-name="userEntered" value="N"/>
+ </link>
</container>
<container>
<label style="h3">${uiLabelMap.CommonView} ${uiLabelMap.CommonActiveInactive}</label>
- <link target="EditProductStorePromos?productStoreId=${productStoreId}&activeOnly=N" text="${uiLabelMap.CommonAll}" style="buttontext"/>
- <link target="EditProductStorePromos?productStoreId=${productStoreId}&activeOnly=N&userEntered=Y" text="${uiLabelMap.CommonUserEnteredOnly}" style="buttontext"/>
- <link target="EditProductStorePromos?productStoreId=${productStoreId}&activeOnly=N&userEntered=N" text="${uiLabelMap.ProductPromotionImported}" style="buttontext"/>
+ <link target="EditProductStorePromos" text="${uiLabelMap.CommonAll}" style="buttontext">
+ <parameter param-name="productStoreId" from-field="productStoreId"/>
+ <parameter param-name="activeOnly" value="N"/>
+ </link>
+ <link target="EditProductStorePromos" text="${uiLabelMap.CommonUserEnteredOnly}" style="buttontext">
+ <parameter param-name="productStoreId" from-field="productStoreId"/>
+ <parameter param-name="activeOnly" value="N"/>
+ <parameter param-name="userEntered" value="Y"/>
+ </link>
+ <link target="EditProductStorePromos" text="${uiLabelMap.ProductPromotionImported}" style="buttontext">
+ <parameter param-name="productStoreId" from-field="productStoreId"/>
+ <parameter param-name="activeOnly" value="N"/>
+ <parameter param-name="userEntered" value="N"/>
+ </link>
</container>
<container style="screenlet">
<container style="screenlet-title-bar">
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=760973&r1=760972&r2=760973&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Wed Apr 1 17:28:03 2009
@@ -201,11 +201,20 @@
<decorator-section name="body">
<container>
<label style="h3">${uiLabelMap.CommonView} </label>
- <link target="FindFacilityTransfers?facilityId=${facilityId}&activeOnly=true" text="${uiLabelMap.ProductActiveOnly}" style="buttontext"/>
- <link target="FindFacilityTransfers?facilityId=${facilityId}&activeOnly=false" text="${uiLabelMap.CommonAll}" style="buttontext"/>
+ <link target="FindFacilityTransfers" text="${uiLabelMap.ProductActiveOnly}" style="buttontext">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ <parameter param-name="activeOnly" value="true"/>
+ </link>
+ <link target="FindFacilityTransfers" text="${uiLabelMap.CommonAll}" style="buttontext">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ <parameter param-name="activeOnly" value="false"/>
+ </link>
</container>
<container>
- <link target="FindFacilityTransfers?facilityId=${facilityId}&completeRequested=true" text="${uiLabelMap.ProductCompleteRequestedTransfers}" style="buttontext"/>
+ <link target="FindFacilityTransfers" text="${uiLabelMap.ProductCompleteRequestedTransfers}" style="buttontext">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ <parameter param-name="completeRequested" value="true"/>
+ </link>
<link target="TransferInventoryItem?facilityId=${facilityId}" text="${uiLabelMap.ProductInventoryTransfer}" style="buttontext"/>
</container>
<container style="screenlet">
@@ -412,9 +421,18 @@
<!--<link target="ViewFacilityInventoryByProductSimple?facilityId=${facilityId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>-->
<link target="ViewFacilityInventoryByProductReport?${searchParameterString}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
<link target="ViewFacilityInventoryByProductExport?${searchParameterString}" text="${uiLabelMap.CommonExport}" style="buttontext"/>
- <link target="InventoryItemTotals?facilityId=${facilityId}&action=Y" text="${uiLabelMap.ProductInventoryItemTotals}" style="buttontext"/>
- <link target="InventoryItemGrandTotals?facilityId=${facilityId}&action=Y" text="${uiLabelMap.ProductInventoryItemGrandTotals}" style="buttontext"/>
- <link target="InventoryItemTotalsExport.csv?facilityId=${facilityId}&action=Y" text="${uiLabelMap.ProductInventoryItemTotalsExport}" style="buttontext"/>
+ <link target="InventoryItemTotals" text="${uiLabelMap.ProductInventoryItemTotals}" style="buttontext">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ <parameter param-name="action" value="Y"/>
+ </link>
+ <link target="InventoryItemGrandTotals" text="${uiLabelMap.ProductInventoryItemGrandTotals}" style="buttontext">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ <parameter param-name="action" value="Y"/>
+ </link>
+ <link target="InventoryItemTotalsExport.csv" text="${uiLabelMap.ProductInventoryItemTotalsExport}" style="buttontext">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ <parameter param-name="action" value="Y"/>
+ </link>
<link target="InventoryAverageCosts?facilityId=${facilityId}" text="${uiLabelMap.ProductInventoryAverageCosts}" style="buttontext"/>
</container>
</decorator-section>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=760973&r1=760972&r2=760973&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed Apr 1 17:28:03 2009
@@ -290,6 +290,7 @@
<container>
<link text="${uiLabelMap.CommonGoBack}" target="FindTask" style="buttontext">
<parameter param-name="workEffortId" from-field="task.workEffortParentId"/>
+ <parameter param-name="workEffortTypeId" from-field="TASK"/>
</link>
</container>
<label style="h1">${uiLabelMap.ProjectMgrSubTaskName}: ${task.workEffortName}</label>