svn commit: r1806175 - in /ofbiz/ofbiz-plugins/trunk: assetmaint/widget/ assetmaint/widget/ismgr/ birt/widget/facility/ ecommerce/groovyScripts/shoppinglist/ ecommerce/widget/ example/widget/example/ scrum/widget/

[nmalin]

Author: nmalin
Date: Fri Aug 25 14:52:21 2017
New Revision: 1806175

URL: http://svn.apache.org/viewvc?rev=1806175&view=rev
Log:
Implemented: Change all <set> screen and script groovy that call widget.properties values replaced by call to modelTheme (OFBIZ-9138 Create a common theme)

Modified:
    ofbiz/ofbiz-plugins/trunk/assetmaint/widget/FacilityScreens.xml
    ofbiz/ofbiz-plugins/trunk/assetmaint/widget/LookupScreens.xml
    ofbiz/ofbiz-plugins/trunk/assetmaint/widget/ismgr/LookupScreens.xml
    ofbiz/ofbiz-plugins/trunk/birt/widget/facility/FacilityScreens.xml
    ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy
    ofbiz/ofbiz-plugins/trunk/ecommerce/widget/ForumScreens.xml
    ofbiz/ofbiz-plugins/trunk/example/widget/example/ExampleFeatureScreens.xml
    ofbiz/ofbiz-plugins/trunk/scrum/widget/LookupScreens.xml

Modified: ofbiz/ofbiz-plugins/trunk/assetmaint/widget/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/assetmaint/widget/FacilityScreens.xml?rev=1806175&r1=1806174&r2=1806175&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/assetmaint/widget/FacilityScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/assetmaint/widget/FacilityScreens.xml Fri Aug 25 14:52:21 2017
@@ -27,7 +27,7 @@
                 <set field="headerItem" value="facility"/>
                 <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-plugins/trunk/assetmaint/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/assetmaint/widget/LookupScreens.xml?rev=1806175&r1=1806174&r2=1806175&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/assetmaint/widget/LookupScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/assetmaint/widget/LookupScreens.xml Fri Aug 25 14:52:21 2017
@@ -33,7 +33,7 @@
                 <set field="entityName" value="Person"/>
                 <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-plugins/trunk/assetmaint/widget/ismgr/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/assetmaint/widget/ismgr/LookupScreens.xml?rev=1806175&r1=1806174&r2=1806175&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/assetmaint/widget/ismgr/LookupScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/assetmaint/widget/ismgr/LookupScreens.xml Fri Aug 25 14:52:21 2017
@@ -31,7 +31,7 @@ under the License.
                 <set field="title" value="${uiLabelMap.PageTitleLookupComputerHardware}"/>
                 <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>
@@ -57,7 +57,7 @@ under the License.
                 <set field="title" value="${uiLabelMap.PageTitleLookupComputerSoftware}"/>
                 <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-plugins/trunk/birt/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/widget/facility/FacilityScreens.xml?rev=1806175&r1=1806174&r2=1806175&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/birt/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/birt/widget/facility/FacilityScreens.xml Fri Aug 25 14:52:21 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-plugins/trunk/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy?rev=1806175&r1=1806174&r2=1806175&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/groovyScripts/shoppinglist/EditShoppingList.groovy Fri Aug 25 14:52:21 2017
@@ -30,6 +30,7 @@ import org.apache.ofbiz.product.catalog.
 import org.apache.ofbiz.product.store.*
 import org.apache.ofbiz.service.calendar.*
 import org.apache.ofbiz.webapp.website.WebSiteWorker
+import org.apache.ofbiz.widget.renderer.VisualTheme
 
 if (userLogin)
 {
@@ -40,6 +41,7 @@ if (userLogin)
 
 
 cart = ShoppingCartEvents.getCartObject(request)
+VisualTheme visualTheme =
 currencyUomId = cart.getCurrency()
 
 productStoreId = ProductStoreWorker.getProductStoreId(request)
@@ -142,7 +144,7 @@ if (shoppingListId) {
             context.shoppingListItemDatas = shoppingListItemDatas
             // pagination for the shopping list
             viewIndex = Integer.valueOf(parameters.VIEW_INDEX  ?: 1)
-            viewSize = parameters.VIEW_SIZE ?: EntityUtilProperties.getPropertyAsInteger("widget", "widget.form.defaultViewSize", 20)
+            viewSize = parameters.VIEW_SIZE ?: visualTheme.getModelTheme().getDefaultViewSize()?:20
             listSize = shoppingListItemDatas ? shoppingListItemDatas.size() : 0
 
             lowIndex = ((viewIndex - 1) * viewSize) + 1

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/ForumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/ForumScreens.xml?rev=1806175&r1=1806174&r2=1806175&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/ForumScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/ForumScreens.xml Fri Aug 25 14:52:21 2017
@@ -63,7 +63,7 @@ under the License.
                 <!-- parameters for the performFind service -->
                 <set field="parameters.forumId" from-field="parameters.forumId" default-value="${parameters.contentId}"/>
                 <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="ContentAssocViewTo" list="forumMessages" >
                     <condition-list combine="and">

Modified: ofbiz/ofbiz-plugins/trunk/example/widget/example/ExampleFeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/widget/example/ExampleFeatureScreens.xml?rev=1806175&r1=1806174&r2=1806175&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/example/widget/example/ExampleFeatureScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/example/widget/example/ExampleFeatureScreens.xml Fri Aug 25 14:52:21 2017
@@ -111,7 +111,7 @@ under the License.
                 <set field="title" value="${uiLabelMap.PageTitleLookupExampleFeature}"/>
                 <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}"/>
                 
                 <!-- entries needed for lookup ajax auto completer -->

Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/LookupScreens.xml?rev=1806175&r1=1806174&r2=1806175&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/scrum/widget/LookupScreens.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/scrum/widget/LookupScreens.xml Fri Aug 25 14:52:21 2017
@@ -31,7 +31,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]"/>