svn commit: r1806150 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/widget
Locked
svn commit: r1806150 [1/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/widget
 
|
Author: nmalin
Date: Fri Aug 25 10:02:34 2017 New Revision: 1806150 URL: http://svn.apache.org/viewvc?rev=1806150&view=rev Log: Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme) Five step #9 Change all set screen and script that call widget.properties values replaced by call to modelTheme Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CostScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/TransactionScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/SurveyScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/WebAnalyticsScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutScreens.xml ofbiz/ofbiz-framework/trunk/applications/humanres/widget/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/humanres/widget/PerfReviewScreens.xml ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/SegmentScreens.xml ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FindOrders.groovy ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/RequirementScreens.xml ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/party/EditShoppingList.groovy ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/visit/ShowVisits.groovy ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/FeatureScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/PriceScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/ReportScreens.xml ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestScreens.xml ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetScreens.xml ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/FindAutocompleteOptions.groovy ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CostScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CostScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CostScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CostScreens.xml Fri Aug 25 10:02:34 2017 @@ -28,7 +28,7 @@ under the License. <set field="tabButtonItem" value="Costs"/> <set field="titleProperty" value="PageTitleEditCostCalcs"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <entity-condition entity-name="CostComponentCalc" list="allCostComponentCalcs"/> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/FinAccountScreens.xml Fri Aug 25 10:02:34 2017 @@ -74,7 +74,7 @@ under the License. <set field="titleProperty" value="PageTitleFindFinAccount"/> <set field="tabButtonItem" value="FindFinAccount"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="displayAdvancedSearch" from-field="parameters.displayAdvancedSearch"/> </actions> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Fri Aug 25 10:02:34 2017 @@ -224,7 +224,7 @@ under the License. <limit-range start="0" size="20"/> </entity-and --> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml Fri Aug 25 10:02:34 2017 @@ -27,7 +27,7 @@ under the License. <set field="titleProperty" value="AccountingListInvoiceItemType"/> <set field="tabButtonItem" value="InvoiceItemTypes"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <entity-condition entity-name="InvoiceItemType" list="invoiceItemTypes"> <order-by field-name="invoiceItemTypeId"/> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml Fri Aug 25 10:02:34 2017 @@ -30,7 +30,7 @@ under the License. <set field="title" value="${uiLabelMap.AccountingLookupPayment}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="Payment"/> <set field="searchFields" value="[paymentId, partyIdFrom, partyIdTo, currencyUomId]"/> @@ -57,7 +57,7 @@ under the License. <set field="title" value="${uiLabelMap.AccountingLookupInvoices}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="Invoice"/> <set field="searchFields" value="[invoiceId, partyIdFrom, partyId, description, currencyUomId]"/> @@ -84,7 +84,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupFixedAsset}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="FixedAsset"/> <set field="searchFields" value="[fixedAssetId, fixedAssetName]"/> @@ -112,7 +112,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupBillingAccount}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="BillingAccount"/> <set field="searchFields" value="[billingAccountId, description, externalAccountId, accountCurrencyUomId]"/> @@ -140,7 +140,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupGlAccount}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="GlAccount"/> <set field="searchFields" value="[glAccountId, accountName, glAccountTypeId, glAccountClassId]"/> @@ -168,7 +168,7 @@ under the License. <set field="title" value="${uiLabelMap.AccountingLookupAgreement}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="Agreement"/> <set field="searchFields" value="[agreementId, productId, description]"/> @@ -196,7 +196,7 @@ under the License. <set field="title" value="${uiLabelMap.AccountingLookupAgreementItem}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="AgreementItem"/> <set field="searchFields" value="[agreementItemSeqId, agreementId, currencyUomId]"/> @@ -224,7 +224,7 @@ under the License. <set field="title" value="${uiLabelMap.AccountingLookupPaymentGroupMember}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="PaymentGroupMember"/> <set field="searchFields" value="[paymentGroupId, paymentId, sequenceNum]"/> @@ -251,7 +251,7 @@ under the License. <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.AccountingLookupGlReconciliations}"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="GlReconciliation"/> <set field="searchFields" value="[glReconciliationId, glReconciliationName, description]"/> @@ -276,7 +276,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupCustomTimePeriod}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="CustomTimePeriod"/> <set field="searchFields" value="[customTimePeriodId, periodName]"/> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml Fri Aug 25 10:02:34 2017 @@ -55,7 +55,7 @@ under the License. <set field="titleProperty" value="PageTitleFindPaymentGatewayConfig"/> <set field="tabButtonItem" value="paymentGatewayConfigTab"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -247,7 +247,7 @@ under the License. <set field="titleProperty" value="PageTitleFindPaymentGatewayConfigTypes"/> <set field="tabButtonItem" value="paymentGatewayConfigTypesTab"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml Fri Aug 25 10:02:34 2017 @@ -27,7 +27,7 @@ under the License. <set field="tabButtonItem" value="PaymentMethodTypes"/> <set field="titleProperty" value="CommonPaymentMethodType"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <entity-condition entity-name="PaymentMethodType" list="paymentMethodTypes"> <order-by field-name="paymentMethodTypeId"/> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/PaymentScreens.xml Fri Aug 25 10:02:34 2017 @@ -514,7 +514,7 @@ under the License. <set field="titleProperty" value="AccountingFindSalesInvoicesByDueDate"/> <set field="headerItem" value="payments"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <script location="component://accounting/groovyScripts/payment/FindInvoicesByDueDate.groovy"/> </actions> @@ -545,7 +545,7 @@ under the License. <set field="titleProperty" value="AccountingFindPurchaseInvoicesByDueDate"/> <set field="headerItem" value="payments"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <script location="component://accounting/groovyScripts/payment/FindInvoicesByDueDate.groovy"/> </actions> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/TransactionScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/TransactionScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/TransactionScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/TransactionScreens.xml Fri Aug 25 10:02:34 2017 @@ -57,7 +57,7 @@ under the License. <set field="titleProperty" value="PageTitleFindGatewayResponses"/> <!-- shows up in browser title bar --> <set field="tabButtonItem" value="gatewayresponsestab"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/CommonScreens.xml Fri Aug 25 10:02:34 2017 @@ -114,7 +114,7 @@ under the License. <set field="headerItem" value="findVendors"/> <set field="titleProperty" value="AccountingApPageTitleFindVendors"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/LookupScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ap/LookupScreens.xml Fri Aug 25 10:02:34 2017 @@ -31,7 +31,7 @@ under the License. <set field="title" value="${uiLabelMap.AccountingLookupInvoices}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="Invoice"/> <set field="searchFields" value="[invoiceId, partyIdFrom, partyId, description, currencyUomId]"/> @@ -59,7 +59,7 @@ under the License. <set field="title" value="${uiLabelMap.AccountingLookupPayment}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="Payment"/> <set field="searchFields" value="[paymentId, partyIdFrom, partyIdTo, currencyUomId]"/> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/LookupScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/ar/LookupScreens.xml Fri Aug 25 10:02:34 2017 @@ -31,7 +31,7 @@ under the License. <set field="title" value="${uiLabelMap.AccountingLookupInvoices}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="Invoice"/> <set field="searchFields" value="[invoiceId, partyIdFrom, partyId, description, currencyUomId]"/> @@ -59,7 +59,7 @@ under the License. <set field="title" value="${uiLabelMap.AccountingLookupPayment}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="Payment"/> <set field="searchFields" value="[paymentId, partyIdFrom, partyIdTo, currencyUomId]"/> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/LookupScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/LookupScreens.xml Fri Aug 25 10:02:34 2017 @@ -30,7 +30,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupListLayout}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -52,7 +52,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupSubContent}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/SurveyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/SurveyScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/SurveyScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/SurveyScreens.xml Fri Aug 25 10:02:34 2017 @@ -290,7 +290,7 @@ under the License. <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="surveyId" from-field="parameters.surveyId"/> @@ -392,7 +392,7 @@ under the License. <set field="title" from-field="uiLabelMap.PageTitleLookupSurvey"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -417,7 +417,7 @@ under the License. <set field="title" from-field="uiLabelMap.PageTitleLookupSurveyResponse"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/WebAnalyticsScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/WebAnalyticsScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/WebAnalyticsScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/WebAnalyticsScreens.xml Fri Aug 25 10:02:34 2017 @@ -31,7 +31,7 @@ under the License. <set field="webSiteId" from-field="parameters.webSiteId"/> <entity-one entity-name="WebSite" value-field="webSite"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/content/ContentScreens.xml Fri Aug 25 10:02:34 2017 @@ -174,12 +174,7 @@ under the License. <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonExtUiLabels" map-name="uiLabelMap" global="true"/> <set field="contentId" from-field="parameters.contentId" default-value="${contentId}"/> - <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" global="true"/> - <service service-name="getVisualThemeResources"> - <field-map field-name="visualThemeId"/> - <field-map field-name="themeResources" from-field="layoutSettings"/> - </service> - <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/> + <script location="component://common/groovyScripts/InitTheme.groovy"/> </actions> <widgets> <content content-id="${contentId}"/> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml Fri Aug 25 10:02:34 2017 @@ -27,7 +27,7 @@ under the License. <set field="headerItem" value="DataResourceSetupMenu"/> <set field="tabButtonItem" to-scope="user" value="EditDataResourceType"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -49,7 +49,7 @@ under the License. <set field="headerItem" value="DataResourceSetupMenu"/> <set field="tabButtonItem" to-scope="user" value="EditCharacterSet"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -71,7 +71,7 @@ under the License. <set field="headerItem" value="DataResourceSetupMenu"/> <set field="tabButtonItem" to-scope="user" value="EditDataResourceTypeAttr"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -93,7 +93,7 @@ under the License. <set field="headerItem" value="DataResourceSetupMenu"/> <set field="tabButtonItem" to-scope="user" value="EditFileExtension"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -115,7 +115,7 @@ under the License. <set field="headerItem" value="DataResourceSetupMenu"/> <set field="tabButtonItem" to-scope="user" value="EditMetaDataPredicate"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -137,7 +137,7 @@ under the License. <set field="headerItem" value="DataResourceSetupMenu"/> <set field="tabButtonItem" to-scope="user" value="EditMimeType"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -159,7 +159,7 @@ under the License. <set field="headerItem" value="DataResourceSetupMenu"/> <set field="tabButtonItem" to-scope="user" value="EditMimeTypeHtmlTemplate"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -182,7 +182,7 @@ under the License. <set field="tabButtonItem" to-scope="user" value="EditDataCategory"/> <script location="component://content/groovyScripts/datasetup/DataCategoryPrep.groovy"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/widget/layout/LayoutScreens.xml Fri Aug 25 10:02:34 2017 @@ -27,7 +27,7 @@ under the License. <set field="headerItem" value="Layout"/> <set field="tabButtonItem" to-scope="user" value="FindLayout"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -57,7 +57,7 @@ under the License. <set field="headerItem" value="Layout"/> <set field="tabButtonItem" to-scope="user" value="ListLayout"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <entity-and entity-name="ContentAssocDataResourceViewFrom" list="layoutList"> <field-map field-name="caContentIdTo" value="TEMPLATE_MASTER"/> Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/LookupScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/humanres/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/humanres/widget/LookupScreens.xml Fri Aug 25 10:02:34 2017 @@ -27,7 +27,7 @@ <set field="title" value="${uiLabelMap.HumanResLookupBudgetByName}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -49,7 +49,7 @@ <set field="title" value="${uiLabelMap.HumanResLookupBudgetItemByName}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -71,7 +71,7 @@ <set field="title" value="${uiLabelMap.HumanResLookupEmplPositionByName}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="entityName" value="EmplPosition"/> <set field="searchFields" value="[emplPositionId, partyId, emplPositionTypeId]"/> @@ -95,7 +95,7 @@ <set field="title" value="${uiLabelMap.HumanResLookupTerminationReason}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -118,7 +118,7 @@ <set field="title" value="${uiLabelMap.HumanResLookupSalaryStepSeqId}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -140,7 +140,7 @@ <set field="title" value="${uiLabelMap.HumanResLookupPayGrade}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -162,7 +162,7 @@ <set field="title" value="${uiLabelMap.HumanResLookupPayRollPreference}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -184,7 +184,7 @@ <set field="title" value="${uiLabelMap.HumanResLookupUnemploymentClaim}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -207,7 +207,7 @@ <set field="title" value="${uiLabelMap.HumanResLookupAgreementEmploymentAppl}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -229,7 +229,7 @@ <set field="title" value="${uiLabelMap.HumanResLookupPerfReview}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -251,7 +251,7 @@ <set field="title" value="${uiLabelMap.HumanResLookupPartyResume}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -273,7 +273,7 @@ <set field="title" value="${uiLabelMap.HumanResLookupEmploymentApp}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -295,7 +295,7 @@ <set field="title" value="${uiLabelMap.LookupJobReq}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -333,7 +333,7 @@ <set field="title" value="${uiLabelMap.LookupTraining}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/widget/PerfReviewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/widget/PerfReviewScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/humanres/widget/PerfReviewScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/humanres/widget/PerfReviewScreens.xml Fri Aug 25 10:02:34 2017 @@ -27,7 +27,7 @@ <set field="headerItem" value="PerfReview"/> <set field="employeePartyId" from-field="parameters.partyId"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/groovyScripts/mrp/FindInventoryEventPlan.groovy Fri Aug 25 10:02:34 2017 @@ -69,7 +69,7 @@ context.paramList = paramList // set the page parameters viewIndex = Integer.valueOf(parameters.VIEW_INDEX ?: 0) -viewSize = parameters.VIEW_SIZE ?Integer.valueOf(parameters.VIEW_SIZE): EntityUtilProperties.getPropertyAsInteger("widget", "widget.form.defaultViewSize", 20) +viewSize = parameters.VIEW_SIZE ?Integer.valueOf(parameters.VIEW_SIZE): modelTheme.getDefaultViewSize()?:20 listSize = 0 if (inventoryList) listSize = inventoryList.size() Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml Fri Aug 25 10:02:34 2017 @@ -68,7 +68,7 @@ under the License. <set field="tabButtonItem" value="Calendar"/> <set field="headerItem" value="calendar"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <entity-condition entity-name="TechDataCalendar" list="techDataCalendars"/> @@ -94,7 +94,7 @@ under the License. <set field="tabButtonItem" value="CalendarWeek"/> <set field="headerItem" value="calendar"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <entity-condition entity-name="TechDataCalendarWeek" list="calendarWeeks"/> Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/CostScreens.xml Fri Aug 25 10:02:34 2017 @@ -26,7 +26,7 @@ under the License. <set field="titleProperty" value="PageTitleEditCostCalcs"/> <set field="headerItem" value="costs"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Fri Aug 25 10:02:34 2017 @@ -85,7 +85,7 @@ under the License. <set field="tabButtonItem" value="edit"/> <set field="headerItem" value="jobshop"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <script location="component://manufacturing/groovyScripts/jobshopmgt/ViewProductionRun.groovy"/> <script location="component://manufacturing/groovyScripts/jobshopmgt/ProductionRunAllFixedAssets.groovy"/> @@ -163,7 +163,7 @@ under the License. <set field="tabButtonItem" value="declaration"/> <set field="headerItem" value="jobshop"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <script location="component://manufacturing/groovyScripts/jobshopmgt/ProductionRunDeclaration.groovy"/> @@ -448,7 +448,7 @@ under the License. <set field="tabButtonItem" value="tasks"/> <set field="headerItem" value="jobshop"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="productionRunId" from-field="parameters.productionRunId"/> @@ -481,7 +481,7 @@ under the License. <set field="headerItem" value="jobshop"/> <set field="formName" value="ProductionRunTaskComponents"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="productionRunId" from-field="parameters.productionRunId"/> @@ -516,7 +516,7 @@ under the License. <set field="headerItem" value="jobshop"/> <set field="formName" value="ProductionRunTaskActualComponents"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="productionRunId" from-field="parameters.productionRunId"/> @@ -547,7 +547,7 @@ under the License. <set field="headerItem" value="jobshop"/> <set field="formName" value="ProductionRunTaskFixedAssets"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="productionRunId" from-field="parameters.productionRunId"/> @@ -680,7 +680,7 @@ under the License. <set field="titleProperty" value="ManufacturingFindProductionRun"/> <set field="headerItem" value="jobshop"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/LookupScreens.xml Fri Aug 25 10:02:34 2017 @@ -34,7 +34,7 @@ under the License. <set field="queryString" from-field="result.queryString"/> <set field="searchFields" value="[workEffortId]"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -63,7 +63,7 @@ under the License. <set field="queryString" from-field="result.queryString"/> <set field="searchFields" value="[workEffortId, workEffortName]"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml Fri Aug 25 10:02:34 2017 @@ -61,7 +61,7 @@ under the License. <set field="tabButtonItem" value="findInventoryEventPlan"/> <set field="headerItem" value="mrp"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <entity-condition entity-name="JobSandbox" list="mrpActiveJobs"> Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Fri Aug 25 10:02:34 2017 @@ -91,7 +91,7 @@ under the License. <set field="tabButtonItem" value="findRouting"/> <set field="headerItem" value="routing"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="asm_multipleSelectForm" value="FindRoutings"/> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListScreens.xml Fri Aug 25 10:02:34 2017 @@ -99,7 +99,7 @@ under the License. <!-- parameters for pagination --> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactList"/> @@ -179,7 +179,7 @@ under the License. <!-- parameters for pagination --> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="contactListId" from-field="parameters.contactListId"/> @@ -287,7 +287,7 @@ under the License. <!-- parameters for pagination --> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="FindContactListCommEvents?contactListId=${parameters.contactListId}"/> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/LookupScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/LookupScreens.xml Fri Aug 25 10:02:34 2017 @@ -33,7 +33,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupSegmentGroup}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/SegmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/SegmentScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/SegmentScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/SegmentScreens.xml Fri Aug 25 10:02:34 2017 @@ -37,7 +37,7 @@ under the License. <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> </actions> <widgets> @@ -159,7 +159,7 @@ under the License. <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="segmentGroupId" from-field="parameters.segmentGroupId"/> </actions> @@ -202,7 +202,7 @@ under the License. <set field="segmentTabButtonItem" value="SegmentGroupGeo"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="segmentGroupId" from-field="parameters.segmentGroupId"/> </actions> @@ -245,7 +245,7 @@ under the License. <set field="segmentTabButtonItem" value="SegmentGroupRole"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="segmentGroupId" from-field="parameters.segmentGroupId"/> </actions> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/TrackingCodeScreens.xml Fri Aug 25 10:02:34 2017 @@ -182,7 +182,7 @@ under the License. <!-- parameters for pagination --> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCode"/> @@ -256,7 +256,7 @@ under the License. <!-- parameters for pagination --> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListTrackingCode"/> Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/entry/catalog/CategoryDetail.groovy Fri Aug 25 10:02:34 2017 @@ -39,7 +39,7 @@ viewIndex = parameters.VIEW_INDEX currentCatalogId = CatalogWorker.getCurrentCatalogId(request) // set the default view size -defaultViewSize = request.getAttribute("defaultViewSize") ?: EntityUtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", "20", delegator) +defaultViewSize = request.getAttribute("defaultViewSize") ?: modelTheme.getDefaultViewSize()?:20 context.defaultViewSize = defaultViewSize // set the limit view Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FindOrders.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FindOrders.groovy?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FindOrders.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/FindOrders.groovy Fri Aug 25 10:02:34 2017 @@ -146,8 +146,7 @@ context.thruDateStr = toStr viewIndex = request.getParameter("viewIndex") ? Integer.valueOf(request.getParameter("viewIndex")) : 1 context.viewIndex = viewIndex -viewSize = request.getParameter("viewSize") ? Integer.valueOf(request.getParameter("viewSize")) : - EntityUtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", "20", delegator) +viewSize = request.getParameter("viewSize") ? Integer.valueOf(request.getParameter("viewSize")) : modelTheme.getDefaultViewSize()?:20 context.viewSize = viewSize // get the lookup flag Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Fri Aug 25 10:02:34 2017 @@ -248,7 +248,7 @@ under the License. <set field="headerItem" value="request"/> <set field="custRequestId" from-field="parameters.custRequestId"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> - <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <entity-one entity-name="CustRequest" value-field="custRequest"/> <entity-and entity-name="CustRequestItem" list="custRequestItems"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |