svn commit: r808820 [1/2] - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r808820 [1/2] - in /ofbiz/trunk: applications/accounting/webapp
 
|
Author: lektran
Date: Fri Aug 28 08:58:10 2009 New Revision: 808820 URL: http://svn.apache.org/viewvc?rev=808820&view=rev Log: Wherever possible changed ELI queries to limit the result set to the actual rows required of the query, should improve time and memory performance if a cursor isn't being used on large result sets quite a bit. Modified: ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml ofbiz/trunk/applications/accounting/widget/TransactionForms.xml ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml ofbiz/trunk/applications/content/widget/content/ContentForms.xml ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/quote/QuoteForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml ofbiz/trunk/applications/order/webapp/ordermgr/return/ReturnForms.xml ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryForms.xml ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategoryFeatures.groovy ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.groovy ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/CountFacilityInventoryByProduct.groovy ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/FindInventoryItemsByLabels.groovy ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml ofbiz/trunk/applications/product/widget/facility/ShipmentGatewayConfigForms.xml ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java ofbiz/trunk/applications/workeffort/widget/LookupForms.xml ofbiz/trunk/applications/workeffort/widget/TimesheetForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/framework/common/widget/LookupForms.xml ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java ofbiz/trunk/framework/example/widget/example/ExampleFeatureForms.xml ofbiz/trunk/framework/example/widget/example/ExampleForms.xml ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FieldLookupForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/FixedAssetForms.xml ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogForms.xml ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.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=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Fri Aug 28 08:58:10 2009 @@ -57,6 +57,8 @@ <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> <field-map field-name="orderBy" from-field="parameters.sortField"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="Agreement" default-field-type="display"/> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Fri Aug 28 08:58:10 2009 @@ -27,6 +27,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="FixedAsset"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="fixedAssetId" widget-style="linktext"> @@ -334,6 +336,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="FixedAssetMaint"/> <field-map field-name="orderBy" value="-maintHistSeqId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="maintHistSeqId"> @@ -423,6 +427,8 @@ <field-map field-name="inputFields" from-field="findParams"/> <field-map field-name="entityName" value="FixedAssetMeter"/> <field-map field-name="orderBy" value="-readingDate"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="fixedAssetId"><hidden/></field> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Fri Aug 28 08:58:10 2009 @@ -53,6 +53,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="InvoiceAndType"/> <field-map field-name="orderBy" from-field="parameters.sortField"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <row-actions> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml Fri Aug 28 08:58:10 2009 @@ -42,6 +42,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="FixedAsset"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="fixedAssetId" widget-style="buttontext"> @@ -67,6 +69,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="BillingAccount"/> <field-map field-name="orderBy" value="billingAccountId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="billingAccountId" title="${uiLabelMap.AccountingBillingAccountId}" widget-style="buttontext"> @@ -104,6 +108,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="GlAccount"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="glAccountId" title="${uiLabelMap.AccountingGlAccountId}" widget-style="buttontext"> @@ -130,6 +136,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Payment"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="paymentId" widget-style="buttontext"> @@ -172,6 +180,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Invoice"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="invoiceId" widget-style="buttontext"> @@ -233,6 +243,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="AgreementItem"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="agreementId"><display/></field> @@ -258,6 +270,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PaymentGroupMember"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="paymentGroupId" widget-style="buttontext"> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Fri Aug 28 08:58:10 2009 @@ -54,6 +54,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PaymentAndType"/> <field-map field-name="orderBy" value="effectiveDate DESC"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <row-actions> Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Fri Aug 28 08:58:10 2009 @@ -46,6 +46,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="FinAccount"/> <field-map field-name="orderBy" value="finAccountId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="FinAccount" default-field-type="display"/> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Fri Aug 28 08:58:10 2009 @@ -1040,6 +1040,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="GlAccountCategory"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="glAccountCategoryId" widget-style="buttontext"> Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Fri Aug 28 08:58:10 2009 @@ -29,6 +29,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="GlAccountOrganization" default-field-type="display"/> @@ -72,6 +74,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" from-field="entityName"/> <field-map field-name="noConditionFind" value="Y"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </actions> Modified: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigForms.xml Fri Aug 28 08:58:10 2009 @@ -43,6 +43,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PaymentGatewayConfig"/> <field-map field-name="orderBy" value="description"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="PaymentGatewayConfig" default-field-type="display"/> @@ -326,6 +328,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PaymentGatewayConfigType"/> <field-map field-name="orderBy" value="description DESC"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="PaymentGatewayConfigType" default-field-type="display"/> Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Fri Aug 28 08:58:10 2009 @@ -35,6 +35,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PaymentGroup"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <row-actions> Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Fri Aug 28 08:58:10 2009 @@ -339,6 +339,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="orderBy" value="partyId"/> <field-map field-name="entityName" value="PartyTaxAuthInfo"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> Modified: ofbiz/trunk/applications/accounting/widget/TransactionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/TransactionForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/TransactionForms.xml Fri Aug 28 08:58:10 2009 @@ -72,6 +72,8 @@ <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> <field-map field-name="orderBy" from-field="orderBy"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="PaymentGatewayResponse" default-field-type="display"/> Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/forms/VendorForms.xml Fri Aug 28 08:58:10 2009 @@ -26,6 +26,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Vendor"/> <field-map field-name="orderBy" value="partyId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java Fri Aug 28 08:58:10 2009 @@ -407,7 +407,8 @@ try { beganTransaction = TransactionUtil.begin(); - EntityListIterator eli = this.getEli(question); + int maxRows = startIndex + number; + EntityListIterator eli = this.getEli(question, maxRows); if (startIndex > 0 && number > 0) { resp = eli.getPartialList(startIndex, number); } else { @@ -545,7 +546,7 @@ // index 1 = total yes // index 2 = total no - EntityListIterator eli = this.getEli(question); + EntityListIterator eli = this.getEli(question, -1); if (eli != null) { GenericValue value; @@ -592,7 +593,7 @@ try { beganTransaction = TransactionUtil.begin(); - EntityListIterator eli = this.getEli(question); + EntityListIterator eli = this.getEli(question, -1); if (eli != null) { GenericValue value; @@ -681,7 +682,7 @@ try { beganTransaction = TransactionUtil.begin(); - EntityListIterator eli = this.getEli(question); + EntityListIterator eli = this.getEli(question, -1); if (eli != null) { GenericValue value; while (((value = (GenericValue) eli.next()) != null)) { @@ -729,12 +730,15 @@ EntityCondition.makeCondition("surveyId", EntityOperator.EQUALS, surveyId)), EntityOperator.AND); } - private EntityListIterator getEli(GenericValue question) throws GenericEntityException { + private EntityListIterator getEli(GenericValue question, int maxRows) throws GenericEntityException { EntityFindOptions efo = new EntityFindOptions(); efo.setResultSetType(EntityFindOptions.TYPE_SCROLL_INSENSITIVE); efo.setResultSetConcurrency(EntityFindOptions.CONCUR_READ_ONLY); efo.setSpecifyTypeAndConcur(true); efo.setDistinct(false); + if (maxRows > 0) { + efo.setMaxRows(maxRows); + } EntityListIterator eli = null; eli = delegator.find("SurveyResponseAndAnswer", makeEliCondition(question), null, null, null, efo); Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Fri Aug 28 08:58:10 2009 @@ -38,6 +38,8 @@ <service service-name="performFind" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Fri Aug 28 08:58:10 2009 @@ -149,6 +149,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="ContentDataResourceView"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml Fri Aug 28 08:58:10 2009 @@ -79,6 +79,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="DataResourceContentView"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="replace" widget-style="buttontext" > Modified: ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml Fri Aug 28 08:58:10 2009 @@ -41,6 +41,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Survey"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="Survey" default-field-type="display"/> @@ -261,6 +263,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SurveyResponse"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="SurveyResponse" default-field-type="display"/> @@ -288,6 +292,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Survey"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="Survey" default-field-type="display"/> @@ -309,6 +315,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SurveyResponse"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="SurveyResponse" default-field-type="display"/> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Fri Aug 28 08:58:10 2009 @@ -44,6 +44,8 @@ <service service-name="performFind" result-map="results" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Content"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="contentId"><display/></field> Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Fri Aug 28 08:58:10 2009 @@ -74,6 +74,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Content"/> <field-map field-name="orderBy" value="contentId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> @@ -117,6 +119,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Content"/> <field-map field-name="orderBy" value="contentId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="contentId"> Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Fri Aug 28 08:58:10 2009 @@ -73,6 +73,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="DataResource"/> <field-map field-name="orderBy" value="dataResourceId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="dataResourceId"><hidden/></field> @@ -131,6 +133,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="DataResource"/> <field-map field-name="orderBy" value="dataResourceId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="dataResourceId"> @@ -348,6 +352,8 @@ <service service-name="performFind" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" from-field="entityName" value="DataResourceAttribute"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-service service-name="updateDataResourceAttribute" default-field-type="display"/> @@ -380,6 +386,8 @@ <service service-name="performFind" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" from-field="entityName" value="DataResourceRole"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-service service-name="updateDataResourceRole" default-field-type="display"/> @@ -409,6 +417,8 @@ <service service-name="performFind" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" from-field="entityName" value="ProductFeatureDataResource"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="ProductFeatureDataResource" default-field-type="display"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplLeaveForms.xml Fri Aug 28 08:58:10 2009 @@ -39,6 +39,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="EmplLeave"/> <field-map field-name="orderBy" value="fromDate"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> <set field="insideEmployee" from-field="parameters.insideEmployee"/> </actions> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmplPositionForms.xml Fri Aug 28 08:58:10 2009 @@ -27,6 +27,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="EmplPosition"/> <field-map field-name="orderBy" value="emplPositionId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="EmplPosition" default-field-type="display"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentAppForms.xml Fri Aug 28 08:58:10 2009 @@ -29,6 +29,8 @@ <field-map field-name="inputFields" from-field="employmentAppCtx"/> <field-map field-name="entityName" value="EmploymentApp"/> <field-map field-name="orderBy" value="applicationId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> <set field="insideEmployee" from-field="parameters.insideEmployee"/> </actions> Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Fri Aug 28 08:58:10 2009 @@ -53,6 +53,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="employmentCtx"/> <field-map field-name="entityName" value="EmploymentAndPerson"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="partyIdFrom" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}"><display></display></field> @@ -83,6 +85,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="employmentCtx"/> <field-map field-name="entityName" value="Employment"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="partyIdFrom" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}"><display></display></field> Modified: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Fri Aug 28 08:58:10 2009 @@ -105,6 +105,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="emplPositionTypeCtx"/> <field-map field-name="entityName" value="EmplPositionType"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-service service-name="updateEmplPositionType" default-field-type="hidden"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml Fri Aug 28 08:58:10 2009 @@ -39,6 +39,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Budget"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="Budget" default-field-type="display"/> @@ -65,6 +67,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="BudgetItem"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="BudgetItem" default-field-type="display"/> @@ -98,6 +102,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="EmplPosition"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="emplPositionId" widget-style="buttontext"> @@ -122,6 +128,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="TerminationReason"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="terminationReasonId" widget-style="buttontext"> @@ -142,6 +150,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SalaryStep"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}" widget-style="buttontext"> @@ -162,6 +172,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PayGrade"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="payGradeId" widget-style="buttontext"> @@ -182,6 +194,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PayrollPreference"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResLookupPayrollPreferenceSeqId}" widget-style="buttontext"> @@ -202,6 +216,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="UnemploymentClaim"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="unemploymentClaimId" widget-style="buttontext"> @@ -222,6 +238,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="AgreementEmploymentAppl"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="agreementItemSeqId" widget-style="buttontext"> @@ -242,6 +260,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PerfReview"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="perfReviewId" widget-style="buttontext"> @@ -262,6 +282,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PartyResume"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="resumeId" widget-style="buttontext"> @@ -282,6 +304,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="EmploymentApp"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="applicationId" widget-style="buttontext"> @@ -316,6 +340,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="JobRequisition"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="jobRequisitionId" widget-style="buttontext"> @@ -338,6 +364,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="TrainingClassType"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartyQualForms.xml Fri Aug 28 08:58:10 2009 @@ -56,6 +56,8 @@ <field-map field-name="inputFields" from-field="partyQualCtx"/> <field-map field-name="entityName" value="PartyQual"/> <field-map field-name="orderBy" value="fromDate"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> <set field="insideEmployee" from-field="parameters.insideEmployee"/> </actions> Modified: ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PartyResumeForms.xml Fri Aug 28 08:58:10 2009 @@ -35,6 +35,8 @@ <field-map field-name="inputFields" from-field="partyResumeCtx"/> <field-map field-name="entityName" value="PartyResume"/> <field-map field-name="orderBy" value="resumeId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="PartyResume" default-field-type="display"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PayGradeForms.xml Fri Aug 28 08:58:10 2009 @@ -33,6 +33,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="payGradeCtx"/> <field-map field-name="entityName" value="PayGrade"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-service default-field-type="display" service-name="updatePayGrade"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PerfReviewForms.xml Fri Aug 28 08:58:10 2009 @@ -39,6 +39,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PerfReview"/> <field-map field-name="orderBy" value="perfReviewId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="PerfReview" default-field-type="display"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/PersonTrainingForms.xml Fri Aug 28 08:58:10 2009 @@ -68,6 +68,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PersonTraining"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="PersonTraining" default-field-type="hidden"/> @@ -102,6 +104,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PersonTraining"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="PersonTraining" default-field-type="display"/> @@ -168,6 +172,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="PersonTraining"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="PersonTraining" default-field-type="display"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml Fri Aug 28 08:58:10 2009 @@ -66,6 +66,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="jobRequisitionId" widget-style="buttontext" use-when="hasAdminPermission"> @@ -168,6 +170,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="EmploymentApp" default-field-type="display"/> @@ -250,6 +254,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="JobInterview" default-field-type="display"/> @@ -339,6 +345,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="EmploymentApp" default-field-type="display"/> @@ -409,6 +417,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="EmplPositionFulfillmentAndReportingStruct"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="partyId" title="Employee Name"> 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=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Fri Aug 28 08:58:10 2009 @@ -69,6 +69,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" value="WorkEffortAndGoods"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="workEffortId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/lookup/FieldLookupForms.xml Fri Aug 28 08:58:10 2009 @@ -36,6 +36,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="workEffortId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> @@ -69,6 +71,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="workEffortId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml Fri Aug 28 08:58:10 2009 @@ -41,6 +41,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="workEffortId" widget-style="buttontext" title="${uiLabelMap.ManufacturingRoutingId}"> @@ -94,6 +96,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="requestParameters"/> <field-map field-name="entityName" from-field="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="workEffortId" title="${uiLabelMap.ManufacturingTaskId}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Fri Aug 28 08:58:10 2009 @@ -117,6 +117,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="orderBy" value="contactListId"/> <field-map field-name="entityName" value="ContactList"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="contactListId" widget-style="buttontext" title="${uiLabelMap.MarketingContactListContactListId}"> @@ -199,7 +201,9 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="filterByDate" from-field="parameters.hideExpired"/> <field-map field-name="orderBy" value="partyId"/> - <field-map field-name="entityName" value="ContactListParty"/> + <field-map field-name="entityName" value="ContactListParty"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <row-actions> @@ -363,6 +367,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="CommunicationEvent"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}"> @@ -422,6 +428,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map value="ContactList" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}" widget-style="buttontext"> @@ -467,6 +475,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml Fri Aug 28 08:58:10 2009 @@ -87,6 +87,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="orderBy" value="dataSourceTypeId"/> <field-map field-name="entityName" value="DataSourceType"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> @@ -123,6 +125,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="dataSourceId" title="${uiLabelMap.DataSourceDataSourceId}" widget-style="buttontext"> @@ -144,6 +148,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml Fri Aug 28 08:58:10 2009 @@ -36,6 +36,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SegmentGroup"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"> @@ -89,6 +91,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SalesForecast"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="SalesForecast" default-field-type="display"/> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml Fri Aug 28 08:58:10 2009 @@ -28,6 +28,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SegmentGroup"/> <field-map field-name="noConditionFind" value="Y"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"> @@ -152,6 +154,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SegmentGroupRole"/> <field-map field-name="noConditionFind" value="Y"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="segmentGroupId"><hidden/></field> 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=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml Fri Aug 28 08:58:10 2009 @@ -138,6 +138,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="orderBy" value="-orderId"/> <field-map field-name="entityName" value="TrackingCodeOrder"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> @@ -185,6 +187,8 @@ <field-map from-field="requestParameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> <field-map field-name="orderBy" value="-fromDate"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}"> @@ -232,6 +236,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}" widget-style="buttontext"> @@ -257,6 +263,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}" widget-style="buttontext"> @@ -322,6 +330,8 @@ <service result-map-list="listIt" result-map="result" service-name="performFind"> <field-map from-field="parameters" field-name="inputFields"/> <field-map from-field="entityName" field-name="entityName"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}" widget-style="buttontext"> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml Fri Aug 28 08:58:10 2009 @@ -32,6 +32,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SalesForecast"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="SalesForecast" default-field-type="display"/> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/OpportunityForms.xml Fri Aug 28 08:58:10 2009 @@ -50,6 +50,8 @@ <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="SalesOpportunity"/> <field-map field-name="orderBy" value="salesOpportunityId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <field name="salesOpportunityId"><hidden/></field> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java Fri Aug 28 08:58:10 2009 @@ -248,12 +248,12 @@ EntityCondition queryConditionsList = EntityCondition.makeCondition(allConditions, EntityOperator.AND); EntityFindOptions options = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true); + options.setMaxRows(viewSize * (viewIndex + 1)); EntityListIterator iterator = delegator.find("OrderHeader", queryConditionsList, null, null, UtilMisc.toList("orderDate DESC"), options); // get subset corresponding to pagination state List orders = iterator.getPartialList(viewSize * viewIndex, viewSize); - iterator.last(); - orderListSize = iterator.currentIndex(); + orderListSize = iterator.getResultsSizeAfterPartialList(); iterator.close(); //Debug.logInfo("### size of list: " + orderListSize, module); return orders; Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java Fri Aug 28 08:58:10 2009 @@ -563,6 +563,7 @@ // get the index for the partial list int lowIndex = (((viewIndex.intValue() - 1) * viewSize.intValue()) + 1); int highIndex = viewIndex.intValue() * viewSize.intValue(); + findOpts.setMaxRows(highIndex); if (cond != null) { EntityListIterator eli = null; @@ -570,9 +571,7 @@ // do the lookup eli = delegator.findListIteratorByCondition(dve, cond, null, fieldsToSelect, orderBy, findOpts); - // attempt to get the full size - eli.last(); - orderCount = eli.currentIndex(); + orderCount = eli.getResultsSizeAfterPartialList(); // get the partial list for this page eli.beforeFirst(); Modified: ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml?rev=808820&r1=808819&r2=808820&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/lookup/FieldLookupForms.xml Fri Aug 28 08:58:10 2009 @@ -66,6 +66,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="OrderHeader"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="OrderHeader" default-field-type="display"/> @@ -121,6 +123,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="OrderHeaderAndShipGroups"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="OrderHeaderAndShipGroups" default-field-type="hidden"/> @@ -228,6 +232,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="CustRequest"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="CustRequest" default-field-type="hidden"/> @@ -271,6 +277,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="CustRequestItem"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="CustRequestItem" default-field-type="hidden"/> @@ -330,6 +338,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Quote"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="Quote" default-field-type="display"/> @@ -395,6 +405,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="QuoteItem"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="QuoteItem" default-field-type="display"/> @@ -468,6 +480,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="Requirement"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="Requirement" default-field-type="hidden"/> @@ -504,6 +518,8 @@ <service service-name="performFind" result-map="result" result-map-list="listIt"> <field-map field-name="inputFields" from-field="parameters"/> <field-map field-name="entityName" value="ShoppingList"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> </service> </actions> <auto-fields-entity entity-name="ShoppingList" default-field-type="hidden"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |