svn commit: r1806150 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/widget
Locked
svn commit: r1806150 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/widget
 
|
Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/LookupScreens.xml Fri Aug 25 10:02:34 2017 @@ -33,7 +33,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupOrderHeader}"/> <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="entityName" value="OrderHeader"/> <set field="searchFields" value="[orderId, orderName]"/> @@ -61,7 +61,7 @@ under the License. <set field="parameters.roleTypeId" to-scope="screen" default-value="SHIP_TO_CUSTOMER"/> <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="entityName" value="OrderHeaderAndShipGroups"/> <set field="searchDistinct" value="true" type="Boolean"/> @@ -89,7 +89,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupPurchaseOrderHeaderAndShipInfo}"/> <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="entityName" value="OrderHeaderAndShipGroups"/> <set field="searchFields" value="[orderId, orderName, toName]"/> @@ -119,7 +119,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupCustomerRequest}"/> <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="entityName" value="CustRequest"/> <set field="searchFields" value="[custRequestId, custRequestName]"/> @@ -147,7 +147,7 @@ under the License. <set field="custRequestId" from-field="parameters.custRequestId" default-value="${parameters.parm0}"/> <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="entityName" value="CustRequestItem"/> <set field="searchFields" value="[custRequestItemSeqId, custRequestId, productId]"/> @@ -174,7 +174,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupQuote}"/> <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="entityName" value="Quote"/> <set field="searchFields" value="[quoteId, quoteName, description]"/> @@ -202,7 +202,7 @@ under the License. <set field="quoteId" from-field="parameters.quoteId" default-value="${parameters.parm0}"/> <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="entityName" value="QuoteItem"/> <set field="searchFields" value="[quoteItemSeqId, quoteId, productId, comments]"/> @@ -229,7 +229,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupRequirement}"/> <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="entityName" value="Requirement"/> <set field="searchFields" value="[requirementId, description]"/> @@ -256,7 +256,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupShoppingList}"/> <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="entityName" value="ShoppingList"/> <set field="searchFields" value="[shoppingListId, listName, description]"/> Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml Fri Aug 25 10:02:34 2017 @@ -165,7 +165,7 @@ under the License. <actions> <set field="titleProperty" value="PageTitleLookupBulkAddProduct"/> <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://order/groovyScripts/entry/cart/LookupBulkAddProducts.groovy"/> </actions> @@ -216,7 +216,7 @@ under the License. <set field="titleProperty" value="OrderAssociatedProducts"/> <script location="component://order/groovyScripts/lookup/LookupAssociatedProducts.groovy"/> <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/order/widget/ordermgr/OrderEntryScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryScreens.xml Fri Aug 25 10:02:34 2017 @@ -57,7 +57,7 @@ under the License. <set field="title" value="${uiLabelMap.OrderFindRequirementsForSupplier}"/> <set field="entityName" value="Requirement"/> <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://order/groovyScripts/entry/SetShoppingCart.groovy"/> </actions> @@ -94,7 +94,7 @@ under the License. <actions> <set field="title" value="${uiLabelMap.OrderFindQuotes}"/> <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="requestParameters.statusId" to-scope="screen" default-value="QUO_APPROVED"/> Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml Fri Aug 25 10:02:34 2017 @@ -44,7 +44,7 @@ under the License. <set field="titleProperty" value="PageTitleFindReturn"/> <set field="headerItem" value="return"/> <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/order/widget/ordermgr/QuoteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Fri Aug 25 10:02:34 2017 @@ -67,7 +67,7 @@ under the License. <set field="titleProperty" value="OrderFindQuote"/> <set field="headerItem" value="quote"/> <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> @@ -307,7 +307,7 @@ under the License. <set field="tabButtonItem" value="ListQuoteItems"/> <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="Quote" value-field="quote" auto-field-map="true"/> <entity-and entity-name="QuoteItem" list="quoteItems"> @@ -488,7 +488,7 @@ under the License. <set field="titleProperty" value="OrderOrderQuotePrices"/> <set field="tabButtonItem" value="ManageQuotePrices"/> <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="Quote" value-field="quote" auto-field-map="true"/> @@ -530,7 +530,7 @@ under the License. <set field="titleProperty" value="OrderOrderQuoteListAdjustments"/> <set field="tabButtonItem" value="ListQuoteAdjustments"/> <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="quoteId" from-field="parameters.quoteId"/> @@ -592,7 +592,7 @@ under the License. <set field="titleProperty" value="OrderOrderQuoteViewProfit"/> <set field="tabButtonItem" value="ViewQuoteProfit"/> <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="Quote" value-field="quote" auto-field-map="true"/> Modified: ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/RequirementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/RequirementScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Fri Aug 25 10:02:34 2017 @@ -86,7 +86,7 @@ under the License. <set field="headerItem" value="requirement"/> <set field="tabButtonItem" value="FindRequirements"/> <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> @@ -112,7 +112,7 @@ under the License. <set field="headerItem" value="requirement"/> <set field="tabButtonItem" value="ApproveRequirements"/> <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://order/groovyScripts/requirement/SelectCreatedProposed.groovy"/> </actions> @@ -139,7 +139,7 @@ under the License. <set field="headerItem" value="requirement"/> <set field="tabButtonItem" value="ApprovedProductRequirements"/> <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="_rowSubmit" value="Y"/> <script location="component://order/groovyScripts/requirement/ApprovedProductRequirements.groovy"/> @@ -194,7 +194,7 @@ under the License. <set field="pageLayoutName" value="simple-landscape"/> <set field="titleProperty" value="PageTitleApprovedProductRequirements"/> <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> @@ -213,7 +213,7 @@ under the License. <set field="headerItem" value="requirement"/> <set field="tabButtonItem" value="ApprovedProductRequirementsByVendor"/> <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://order/groovyScripts/requirement/ApprovedProductRequirementsByVendor.groovy"/> </actions> @@ -236,7 +236,7 @@ under the License. <set field="pageLayoutName" value="simple-landscape"/> <set field="titleProperty" value="PageTitleApprovedProductRequirementsByVendor"/> <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/party/groovyScripts/party/EditShoppingList.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/party/EditShoppingList.groovy?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/party/EditShoppingList.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/party/EditShoppingList.groovy Fri Aug 25 10:02:34 2017 @@ -104,7 +104,7 @@ if (shoppingListId) { context.shoppingListItemDatas = shoppingListItemDatas // pagination for the shopping list 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 = shoppingListItemDatas ? shoppingListItemDatas.size() : 0 lowIndex = (viewIndex * viewSize) + 1 Modified: ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/visit/ShowVisits.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/visit/ShowVisits.groovy?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/visit/ShowVisits.groovy (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/groovyScripts/visit/ShowVisits.groovy Fri Aug 25 10:02:34 2017 @@ -41,7 +41,7 @@ try { beganTransaction = TransactionUtil.begin() viewIndex = Integer.valueOf(parameters.VIEW_INDEX ?: 1) - 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 context.viewIndex = viewIndex context.viewSize = viewSize Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Fri Aug 25 10:02:34 2017 @@ -550,7 +550,7 @@ under the License. <entity-one entity-name="Person" use-cache="true" value-field="lookupPerson"/> <entity-one entity-name="CommunicationEvent" value-field="communicationEvent"/> <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/party/widget/partymgr/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/LookupScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/LookupScreens.xml Fri Aug 25 10:02:34 2017 @@ -30,7 +30,7 @@ under the License. <set field="title" value="${uiLabelMap.PartyLookupPartyByName}"/> <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}"/> <!-- entries needed for lookup ajax auto completer --> @@ -70,7 +70,7 @@ under the License. <set field="title" value="${uiLabelMap.PartyLookupPartyByName}"/> <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="PartyNameContactMechView"/> <set field="searchFields" value="[contactMechId, partyId, firstName, middleName, lastName, groupName]"/> @@ -97,7 +97,7 @@ under the License. <set field="title" value="${uiLabelMap.PartyLookupPartyByName}"/> <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="PartyRoleNameDetail"/> <set field="searchFields" value="[partyId, firstName, middleName, lastName, groupName]"/> @@ -126,7 +126,7 @@ under the License. <set field="title" value="${uiLabelMap.PartyLookupPartyByName}"/> <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 @@ under the License. <set field="entityName" value="PartyAndUserLoginAndPerson"/> <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="searchFields" value="[userLoginId, partyId, firstName, lastName]"/> <script location="component://party/groovyScripts/party/StatusCondition.groovy"/> @@ -258,7 +258,7 @@ under the License. <set field="entityName" value="UserLoginAndPartyDetails"/> <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="searchFields" value="[userLoginId, partyId, firstName, lastName, groupName]"/> <script location="component://party/groovyScripts/party/StatusCondition.groovy"/> @@ -338,7 +338,7 @@ under the License. <set field="searchFields" value="[partyClassificationGroupId, parentGroupId, description]"/> <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> @@ -387,7 +387,7 @@ under the License. <set field="searchFields" value="[contactMechId, partyId, contactMechTypeId, infoString, paToName]"/> <script location="component://party/groovyScripts/party/StatusCondition.groovy"/> <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/product/widget/catalog/FeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/FeatureScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/FeatureScreens.xml Fri Aug 25 10:02:34 2017 @@ -251,7 +251,7 @@ <set field="tabButtonItem" value="FeatureCategory"/> <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://product/groovyScripts/catalog/feature/EditFeatureCategoryFeatures.groovy"/> </actions> @@ -292,7 +292,7 @@ <set field="headerItem" value="featurecats"/> <set field="tabButtonItem" value="FeatureGroup"/> <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="productFeatureGroupId" from-field="parameters.productFeatureGroupId"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/LookupScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/LookupScreens.xml Fri Aug 25 10:02:34 2017 @@ -80,7 +80,7 @@ under the License. <set field="entityName" value="Product"/> <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}"/> <script location="component://product/groovyScripts/catalog/lookup/LookupVariantProduct.groovy"/> </actions> @@ -234,7 +234,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupCostComponentCalc}"/> <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="entityName" value="CostComponentCalc"/> <set field="searchFields" value="[costComponentCalcId, description, costGlAccountTypeId, offsettingGlAccountTypeId]"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/PriceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/PriceScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/PriceScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/PriceScreens.xml Fri Aug 25 10:02:34 2017 @@ -51,7 +51,7 @@ under the License. <set field="titleProperty" value="PageTitleFindProductPriceRule"/> <set field="headerItem" value="pricerules"/> <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/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/ProductScreens.xml Fri Aug 25 10:02:34 2017 @@ -1058,7 +1058,7 @@ under the License. <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> <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://product/groovyScripts/catalog/product/ApplyFeaturesFromCategory.groovy"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml Fri Aug 25 10:02:34 2017 @@ -333,7 +333,7 @@ under the License. <section> <actions> <set field="tabButtonItem" value="EditFacilityInventoryItems"/> - <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="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> @@ -374,7 +374,7 @@ under the License. <set field="tabButtonItem" value="EditFacilityInventoryItems"/> <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-one entity-name="Facility" value-field="facility"/> @@ -462,7 +462,7 @@ under the License. <set field="titleProperty" value="PageTitleEditFacilityInventoryItems"/> <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="facilityId" from-field="parameters.facilityId"/> @@ -506,7 +506,7 @@ under the License. <set field="pageLayoutName" value="simple-landscape"/> <set field="titleProperty" value="PageTitleEditFacilityInventoryItems"/> <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="facilityId" from-field="parameters.facilityId"/> @@ -541,7 +541,7 @@ under the License. <set field="tabButtonItem" value="ViewFacilityInventoryItemsDetails"/> <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-one entity-name="Facility" value-field="facility"/> @@ -600,7 +600,7 @@ under the License. <set field="tabButtonItem2" value="InventoryItemTotalsTab"/> <set field="facilityId" from-field="parameters.facilityId"/> <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-one entity-name="Facility" value-field="facility" use-cache="true"/> @@ -652,7 +652,7 @@ under the License. <set field="facilityId" from-field="parameters.facilityId"/> <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-one entity-name="Facility" value-field="facility" use-cache="true"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/LookupScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/LookupScreens.xml Fri Aug 25 10:02:34 2017 @@ -30,7 +30,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupFacility}"/> <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="entityName" value="Facility"/> <set field="searchFields" value="[facilityId, facilityName, description]"/> @@ -58,7 +58,7 @@ under the License. <set field="facilityId" from-field="parameters.facilityId" default-value="${parameters.parm0}"/> <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="entityName" value="FacilityLocation"/> <set field="searchFields" value="[locationSeqId, facilityId, locationTypeEnumId]"/> @@ -83,7 +83,7 @@ under the License. <set field="title" value="${uiLabelMap.ProductLookupShipment}"/> <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="Shipment"/> <set field="searchFields" value="[shipmentId, shipmentTypeId]"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/ReportScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/ReportScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/ReportScreens.xml Fri Aug 25 10:02:34 2017 @@ -29,7 +29,7 @@ under the License. <set field="headerItem" value="reports"/> <set field="tabButtonItem" value="EditFacilityInventoryItems"/> <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}"/> <!-- This is the target of the search form--> Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml Fri Aug 25 10:02:34 2017 @@ -56,7 +56,7 @@ under the License. <set field="titleProperty" value="PageTitleFindShipmentGatewayConfig"/> <set field="tabButtonItem" value="shipmentGatewayConfigTab"/> <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> @@ -159,7 +159,7 @@ under the License. <set field="titleProperty" value="PageTitleFindShipmentGatewayConfigTypes"/> <set field="tabButtonItem" value="shipmentGatewayConfigTypesTab"/> <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/workeffort/widget/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CustRequestScreens.xml Fri Aug 25 10:02:34 2017 @@ -27,7 +27,7 @@ under the License. <set field="tabButtonItem" value="requestlist"/> <set field="headerItem" value="request"/> <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="custRequestId" from-field="parameters.custRequestId"/> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml Fri Aug 25 10:02:34 2017 @@ -30,7 +30,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupWorkEffort}"/> <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="entityName" value="WorkEffort"/> <set field="searchFields" value="[workEffortId, workEffortName, description]"/> @@ -58,7 +58,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupTimesheet}"/> <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="entityName" value="Timesheet"/> <set field="searchFields" value="[timesheetId, partyId, clientPartyId, comments]"/> @@ -86,7 +86,7 @@ under the License. <set field="title" value="${uiLabelMap.PageTitleLookupWorkEffort}"/> <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="entityName" value="WorkEffort"/> <set field="searchFields" value="[workEffortId, workEffortName, description]"/> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/TimesheetScreens.xml Fri Aug 25 10:02:34 2017 @@ -28,7 +28,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}"/> <entity-condition entity-name="Timesheet" list="currentTimesheetList"> <condition-list combine="and"> Modified: ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/FindAutocompleteOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/FindAutocompleteOptions.groovy?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/FindAutocompleteOptions.groovy (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/groovyScripts/FindAutocompleteOptions.groovy Fri Aug 25 10:02:34 2017 @@ -142,9 +142,6 @@ if (orExprs && entityName && displayFiel def entityConditionList = EntityCondition.makeCondition(mainAndConds, EntityOperator.AND) String viewSizeStr = context.autocompleterViewSize - if (viewSizeStr == null) { - viewSizeStr = EntityUtilProperties.getPropertyValue("widget", "widget.autocompleter.defaultViewSize", delegator) - } Integer autocompleterViewSize = Integer.valueOf(viewSizeStr ?: 10) EntityFindOptions findOptions = new EntityFindOptions() findOptions.setMaxRows(autocompleterViewSize) Modified: ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/widget/SecurityScreens.xml Fri Aug 25 10:02:34 2017 @@ -88,7 +88,7 @@ under the License. <set field="titleProperty" value="PageTitleEditSecurityGroupPermissions"/> <set field="tabButtonItem" value="EditSecurityGroupPermissions"/> <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="groupId" from-field="parameters.groupId"/> <entity-one entity-name="SecurityGroup" value-field="securityGroup"/> @@ -222,7 +222,7 @@ under the License. <set field="titleProperty" value="PageTitleEditIssuerProvisions"/> <set field="tabButtonItem" value="EditCertIssuerProvisions"/> <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> @@ -249,7 +249,7 @@ under the License. <set field="titleProperty" value="PageTitleFindSecurityGroup"/> <set field="tabButtonItem" value="FindSecurityGroup"/> <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> @@ -274,7 +274,7 @@ under the License. <set field="titleProperty" value="FindUserLogin"/> <set field="tabButtonItem" value="FindUserLogin"/> <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/framework/webtools/widget/GeoManagementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml?rev=1806150&r1=1806149&r2=1806150&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml Fri Aug 25 10:02:34 2017 @@ -130,7 +130,7 @@ <set field="title" value="${uiLabelMap.PageTitleLookupGeo}"/> <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="entityName" value="Geo"/> <set field="searchFields" value="[geoId, geoName]"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |