svn commit: r1806327 - in /ofbiz/ofbiz-plugins/trunk: assetmaint/widget/ assetmaint/widget/ismgr/ bi/widget/ birt/widget/birt/ ebaystore/widget/ ecommerce/widget/ ecommerce/widget/blog/ example/widget/example/ hhfacility/widget/hhfacility/ myportal/wid...
Locked
svn commit: r1806327 - in /ofbiz/ofbiz-plugins/trunk: assetmaint/widget/ assetmaint/widget/ismgr/ bi/widget/ birt/widget/birt/ ebaystore/widget/ ecommerce/widget/ ecommerce/widget/blog/ example/widget/example/ hhfacility/widget/hhfacility/ myportal/wid...
 
|
Author: deepak
Date: Sat Aug 26 20:24:09 2017 New Revision: 1806327 URL: http://svn.apache.org/viewvc?rev=1806327&view=rev Log: Improved:Use from-field pattern instead of value=dollor pattern in 'set' element Apply slightly modified patch from jira issue, fixed some typo (OFBIZ-9607) Thanks Suraj Khurana and Rohit Rai for your contribution. Modified: ofbiz/ofbiz-plugins/trunk/assetmaint/widget/CommonScreens.xml ofbiz/ofbiz-plugins/trunk/assetmaint/widget/LookupScreens.xml ofbiz/ofbiz-plugins/trunk/assetmaint/widget/ProductScreens.xml ofbiz/ofbiz-plugins/trunk/assetmaint/widget/ismgr/LookupScreens.xml ofbiz/ofbiz-plugins/trunk/bi/widget/BiScreens.xml ofbiz/ofbiz-plugins/trunk/birt/widget/birt/BirtScreens.xml ofbiz/ofbiz-plugins/trunk/ebaystore/widget/CommonScreens.xml ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbaySellingManagerScreens.xml ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbayStoreScreens.xml ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustomerScreens.xml ofbiz/ofbiz-plugins/trunk/ecommerce/widget/EmailOrderScreens.xml ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogScreens.xml ofbiz/ofbiz-plugins/trunk/example/widget/example/CommonScreens.xml ofbiz/ofbiz-plugins/trunk/example/widget/example/ExampleFeatureScreens.xml ofbiz/ofbiz-plugins/trunk/hhfacility/widget/hhfacility/FacilityScreens.xml ofbiz/ofbiz-plugins/trunk/myportal/widget/CommonScreens.xml ofbiz/ofbiz-plugins/trunk/pricat/widget/CommonScreens.xml ofbiz/ofbiz-plugins/trunk/pricat/widget/SampleScreens.xml ofbiz/ofbiz-plugins/trunk/projectmgr/widget/CommonScreens.xml ofbiz/ofbiz-plugins/trunk/scrum/widget/CommonScreens.xml ofbiz/ofbiz-plugins/trunk/scrum/widget/LookupScreens.xml ofbiz/ofbiz-plugins/trunk/scrum/widget/MyWorkScreens.xml ofbiz/ofbiz-plugins/trunk/scrum/widget/OpenTestScreens.xml ofbiz/ofbiz-plugins/trunk/scrum/widget/ResourceScreens.xml ofbiz/ofbiz-plugins/trunk/scrum/widget/TaskScreens.xml ofbiz/ofbiz-plugins/trunk/scrum/widget/demotest/DemotestScreen.xml ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumScreens.xml ofbiz/ofbiz-plugins/trunk/solr/widget/CommonScreens.xml ofbiz/ofbiz-plugins/trunk/webpos/widget/CommonScreens.xml Modified: ofbiz/ofbiz-plugins/trunk/assetmaint/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/assetmaint/widget/CommonScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/assetmaint/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/assetmaint/widget/CommonScreens.xml Sat Aug 26 20:24:09 2017 @@ -38,7 +38,7 @@ under the License. <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>--> <set field="applicationMenuName" value="AssetMaintAppBar" global="true"/> <set field="applicationMenuLocation" value="component://assetmaint/widget/AssetmaintMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.AssetMaintApplication}"/> + <set field="applicationTitle" from-field="uiLabelMap.AssetMaintApplication"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-plugins/trunk/assetmaint/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/assetmaint/widget/LookupScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/assetmaint/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/assetmaint/widget/LookupScreens.xml Sat Aug 26 20:24:09 2017 @@ -29,7 +29,7 @@ <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupPartyPerson}"/> + <set field="title" from-field="uiLabelMap.PartyLookupPartyPerson"/> <set field="entityName" value="Person"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> Modified: ofbiz/ofbiz-plugins/trunk/assetmaint/widget/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/assetmaint/widget/ProductScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/assetmaint/widget/ProductScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/assetmaint/widget/ProductScreens.xml Sat Aug 26 20:24:09 2017 @@ -28,7 +28,7 @@ </condition> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupProduct}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupProduct"/> <set field="queryString" from-field="result.queryString"/> <set field="primaryProductCategoryId" value="PARTS"/> <set field="submitTarget" value="LookupPartsProduct"/> 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=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/assetmaint/widget/ismgr/LookupScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/assetmaint/widget/ismgr/LookupScreens.xml Sat Aug 26 20:24:09 2017 @@ -28,7 +28,7 @@ under the License. </condition> <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupComputerHardware}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupComputerHardware"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -54,7 +54,7 @@ under the License. </condition> <actions> <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupComputerSoftware}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupComputerSoftware"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> Modified: ofbiz/ofbiz-plugins/trunk/bi/widget/BiScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/bi/widget/BiScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/bi/widget/BiScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/bi/widget/BiScreens.xml Sat Aug 26 20:24:09 2017 @@ -32,7 +32,7 @@ under the License. <set field="activeApp" value="bi" global="true"/> <set field="applicationMenuName" value="BiAppBar" global="true"/> <set field="applicationMenuLocation" value="component://bi/widget/BiMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.BusinessIntelligenceApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.BusinessIntelligenceApplication" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-plugins/trunk/birt/widget/birt/BirtScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/widget/birt/BirtScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/birt/widget/birt/BirtScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/birt/widget/birt/BirtScreens.xml Sat Aug 26 20:24:09 2017 @@ -42,7 +42,7 @@ under the License. <set field="activeApp" value="birt" global="true"/> <set field="applicationMenuName" value="BirtAppBar" global="true"/> <set field="applicationMenuLocation" value="component://birt/widget/birt/BirtMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.BirtExampleApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.BirtExampleApplication" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/widget/CommonScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ebaystore/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ebaystore/widget/CommonScreens.xml Sat Aug 26 20:24:09 2017 @@ -32,7 +32,7 @@ <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.EbayStoreApplication" global="true"/> <set field="applicationMenuName" value="EbayStoreAppBar" global="true"/> <set field="applicationMenuLocation" value="component://ebaystore/widget/EbayStoreMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.EbayStoreApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.EbayStoreApplication" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbaySellingManagerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbaySellingManagerScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbaySellingManagerScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbaySellingManagerScreens.xml Sat Aug 26 20:24:09 2017 @@ -46,12 +46,12 @@ <widgets> <section> <actions> - <set field="parameters.facilityId" value="${facilityId}"/> + <set field="parameters.facilityId" from-field="facilityId"/> <set field="parameters.productStoreId" from-field="parameters.productStoreId"/> <service service-name="getFolderInEbayStoreInventory" result-map="result"> <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> </service> - <set field="ebayfolderId" value="${result.folderId}"/> + <set field="ebayfolderId" from-field="result.folderId"/> </actions> <widgets> <section> @@ -67,7 +67,7 @@ <fail-widgets> <section> <actions> - <set field="parameters.facilityId" value="${facilityId}"/> + <set field="parameters.facilityId" from-field="facilityId"/> <set field="parameters.productStoreId" from-field="parameters.productStoreId"/> </actions> <widgets> @@ -539,7 +539,7 @@ <set field="headerItem" value="ebayStore"/> <set field="sellingManagerItem" value="ordersImported"/> <script location="component://order/groovyScripts/order/FindOrders.groovy"/> - <set field="orderList" value="${orderList}" type="List"/> + <set field="orderList" from-field="orderList" type="List"/> <set field="productStoreId" from-field="parameters.productStoreId"/> </actions> <widgets> @@ -609,16 +609,16 @@ <screen name="customerOfferData"> <section> <actions> - <set field="productStoreId" value="${parameters.productStoreId}"/> - <set field="itemId" value="${parameters.itemId}"/> - <set field="userId" value="${parameters.userId}"/> - <set field="itemName" value="${parameters.itemName}"/> - <set field="email" value="${parameters.email}"/> - <set field="quantity" value="${parameters.quantity}"/> - <set field="price" value="${parameters.price}"/> - <set field="message" value="${parameters.message}"/> - <set field="offerId" value="${parameters.offerId}"/> - <set field="contactStatus" value="${parameters.contactStatus}"/> + <set field="productStoreId" from-field="parameters.productStoreId"/> + <set field="itemId" from-field="parameters.itemId"/> + <set field="userId" from-field="parameters.userId"/> + <set field="itemName" from-field="parameters.itemName"/> + <set field="email" from-field="parameters.email"/> + <set field="quantity" from-field="parameters.quantity"/> + <set field="price" from-field="parameters.price"/> + <set field="message" from-field="parameters.message"/> + <set field="offerId" from-field="parameters.offerId"/> + <set field="contactStatus" from-field="parameters.contactStatus"/> </actions> <widgets> <decorator-screen name="SellingManagerDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbayStoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbayStoreScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbayStoreScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ebaystore/widget/EbayStoreScreens.xml Sat Aug 26 20:24:09 2017 @@ -23,7 +23,7 @@ under the License. <screen name="ebayStores"> <section> <actions> - <set field="titleProperty" value="${uiLabelMap.EbayStore}"/> + <set field="titleProperty" from-field="uiLabelMap.EbayStore"/> <set field="headerItem" value="ebayStore"/> </actions> <widgets> @@ -41,7 +41,7 @@ under the License. <screen name="ebayStoreDetail"> <section> <actions> - <set field="titleProperty" value="${uiLabelMap.EbayStoreSetting}"/> + <set field="titleProperty" from-field="uiLabelMap.EbayStoreSetting"/> <set field="headerItem" value="ebayStore"/> <set field="tabButtonItem" value="ebayStoreSetting"/> <script location="component://ebaystore/groovyScripts/store/RetrieveStoreOptions.groovy"/> @@ -65,7 +65,7 @@ under the License. <set field="titleProperty" value="EbayExportAllCategoryToEbayStore"/> <set field="headerItem" value="ebayStore"/> <set field="tabButtonItem" value="ebayExportAllCategoryToEbayStore"/> - <set field="productStoreId" value="${parameters.productStoreId}"/> + <set field="productStoreId" from-field="parameters.productStoreId"/> <entity-and entity-name="ProdCatalogCategory" list="categoriesList"> <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/> <order-by field-name="productCategoryId"/> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustomerScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustomerScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustomerScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/CustomerScreens.xml Sat Aug 26 20:24:09 2017 @@ -214,7 +214,7 @@ under the License. <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleLogin"/> - <set field="pageHeader" value="${uiLabelMap.CommonContactUs}"/> + <set field="pageHeader" from-field="uiLabelMap.CommonContactUs"/> <set field="headerItem" value="contactus"/> <set field="submitRequest" value="contactsubmit"/> </actions> @@ -284,7 +284,7 @@ under the License. <actions> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="PageTitleNewMessage"/> - <set field="pageHeader" value="${uiLabelMap.PageTitleNewMessage}"/> + <set field="pageHeader" from-field="uiLabelMap.PageTitleNewMessage"/> <set field="showMessageLinks" value="true"/> <set field="submitRequest" value="sendmessage"/> @@ -639,7 +639,7 @@ under the License. <set field="MainColumnStyle" value="rightonly"/> <set field="titleProperty" value="PageTitleLogin"/> - <set field="pageHeader" value="${uiLabelMap.CommonContactUs}"/> + <set field="pageHeader" from-field="uiLabelMap.CommonContactUs"/> <set field="headerItem" value="contactus"/> <set field="submitRequest" value="contactsubmit"/> </actions> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/EmailOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/EmailOrderScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/EmailOrderScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/EmailOrderScreens.xml Sat Aug 26 20:24:09 2017 @@ -104,7 +104,7 @@ under the License. <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleOrderCompleteNotice}"/> + <set field="title" from-field="uiLabelMap.PageTitleOrderCompleteNotice"/> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <script location="component://ecommerce/groovyScripts/order/OrderStatus.groovy"/> </actions> @@ -118,7 +118,7 @@ under the License. <actions> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleOrderBackorderNotice}"/> + <set field="title" from-field="uiLabelMap.PageTitleOrderBackorderNotice"/> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <set field="allowAnonymousView" value="Y"/> <!-- this field will instruction OrderStatus.groovy to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work --> <script location="component://ecommerce/groovyScripts/order/OrderStatus.groovy"/> @@ -133,7 +133,7 @@ under the License. <actions> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleOrderChangeNotice}"/> + <set field="title" from-field="uiLabelMap.PageTitleOrderChangeNotice"/> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <set field="allowAnonymousView" value="Y"/> <!-- this field will instruction OrderStatus.groovy to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work --> <script location="component://ecommerce/groovyScripts/order/OrderStatus.groovy"/> @@ -149,7 +149,7 @@ under the License. <actions> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleOrderPaymentRetryNotice}"/> + <set field="title" from-field="uiLabelMap.PageTitleOrderPaymentRetryNotice"/> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <script location="component://ecommerce/groovyScripts/order/OrderStatus.groovy"/> </actions> @@ -164,7 +164,7 @@ under the License. <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleShipmentCompleteNotice}"/> + <set field="title" from-field="uiLabelMap.PageTitleShipmentCompleteNotice"/> <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <script location="component://ecommerce/groovyScripts/order/ShipmentStatus.groovy"/> </actions> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/widget/blog/BlogScreens.xml Sat Aug 26 20:24:09 2017 @@ -301,7 +301,7 @@ <set field="trail" from-field="articleContentId"/> <set field="enableEdit" value="false"/> <property-to-field property="root.publish.point.blog" field="webPubPt" resource="blog"/> - <set field="rsp.contentName" value="${content.contentName}"/> + <set field="rsp.contentName" from-field="content.contentName"/> </actions> <widgets> <decorator-screen name="CommonBlog" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/ofbiz-plugins/trunk/example/widget/example/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/widget/example/CommonScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/example/widget/example/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/example/widget/example/CommonScreens.xml Sat Aug 26 20:24:09 2017 @@ -42,7 +42,7 @@ under the License. <set field="activeApp" value="example" global="true"/> <set field="applicationMenuName" value="ExampleAppBar" global="true"/> <set field="applicationMenuLocation" value="component://example/widget/example/ExampleMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.ExampleApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.ExampleApplication" global="true"/> </actions> <widgets> <section> 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=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/example/widget/example/ExampleFeatureScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/example/widget/example/ExampleFeatureScreens.xml Sat Aug 26 20:24:09 2017 @@ -108,7 +108,7 @@ under the License. </condition> <actions> <property-map resource="ExampleUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupExampleFeature}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupExampleFeature"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> Modified: ofbiz/ofbiz-plugins/trunk/hhfacility/widget/hhfacility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/hhfacility/widget/hhfacility/FacilityScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/hhfacility/widget/hhfacility/FacilityScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/hhfacility/widget/hhfacility/FacilityScreens.xml Sat Aug 26 20:24:09 2017 @@ -124,7 +124,7 @@ under the License. <screen name="receipt"> <section> <actions> - <set field="title" value="${uiLabelMap.ProductGoodsReceipt}"/> + <set field="title" from-field="uiLabelMap.ProductGoodsReceipt"/> </actions> <widgets> <decorator-screen name="FacilityDecorator"> @@ -139,7 +139,7 @@ under the License. <screen name="poreceipt"> <section> <actions> - <set field="title" value="${uiLabelMap.ProductReceiptPurchaseOrder}"/> + <set field="title" from-field="uiLabelMap.ProductReceiptPurchaseOrder"/> </actions> <widgets> <decorator-screen name="FacilityDecorator"> @@ -168,7 +168,7 @@ under the License. <screen name="productreceipt"> <section> <actions> - <set field="title" value="${uiLabelMap.ProductReceipt}"/> + <set field="title" from-field="uiLabelMap.ProductReceipt"/> <set field="focusField" value="productId"/> </actions> <widgets> @@ -245,7 +245,7 @@ under the License. <screen name="stocktake"> <section> <actions> - <set field="title" value="${uiLabelMap.PageTitleFindProductStocktake}"/> + <set field="title" from-field="uiLabelMap.PageTitleFindProductStocktake"/> <set field="idValue" from-field="parameters.idValue"/> <script location="component://hhfacility/groovyScripts/ProductList.groovy"/> </actions> @@ -263,7 +263,7 @@ under the License. <screen name="productstocktake"> <section> <actions> - <set field="title" value="${uiLabelMap.PageTitleProductStocktake}"/> + <set field="title" from-field="uiLabelMap.PageTitleProductStocktake"/> <script location="component://hhfacility/groovyScripts/ProductStockTake.groovy"/> <set field="locationSeqId" from-field="productFacilityLocations"/> Modified: ofbiz/ofbiz-plugins/trunk/myportal/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/myportal/widget/CommonScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/myportal/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/myportal/widget/CommonScreens.xml Sat Aug 26 20:24:09 2017 @@ -41,7 +41,7 @@ under the License. <set field="applicationMenuLocation" value="component://myportal/widget/MyPortalMenus.xml" global="true"/> <set field="parameters.parentPortalPageId" from-field="parameters.parentPortalPageId" default-value="MYPORTAL" global="true"/> <script location="component://common/groovyScripts/GetParentPortalPageId.groovy"/> - <set field="applicationTitle" value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/> + <set field="applicationTitle" from-field="uiLabelMap.PageTitleMyPortalForNoLogin"/> <set field="my" value="My" global="true"/> </actions> <widgets> Modified: ofbiz/ofbiz-plugins/trunk/pricat/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/widget/CommonScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/pricat/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/pricat/widget/CommonScreens.xml Sat Aug 26 20:24:09 2017 @@ -31,7 +31,7 @@ under the License. <set field="layoutSettings.companyName" from-field="uiLabelMap.PriCatCompanyName" global="true"/> <set field="applicationMenuName" value="PriCatAppBar" global="true"/> <set field="applicationMenuLocation" value="component://pricat/widget/PriCatMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.PriCatApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.PriCatApplication" global="true"/> <set field="layoutSettings.styleSheets[]" value="/pricat/includes/pricat.css" global="true"/> </actions> <widgets> Modified: ofbiz/ofbiz-plugins/trunk/pricat/widget/SampleScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/widget/SampleScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/pricat/widget/SampleScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/pricat/widget/SampleScreens.xml Sat Aug 26 20:24:09 2017 @@ -31,7 +31,7 @@ under the License. <set field="layoutSettings.companyName" from-field="uiLabelMap.PriCatDemoCompanyName" global="true"/> <set field="applicationMenuName" value="PriCatDemoAppBar" global="true"/> <set field="applicationMenuLocation" value="component://pricat/widget/PriCatDemoMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.PriCatDemoApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.PriCatDemoApplication" global="true"/> </actions> <widgets> <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-plugins/trunk/projectmgr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/projectmgr/widget/CommonScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/projectmgr/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/projectmgr/widget/CommonScreens.xml Sat Aug 26 20:24:09 2017 @@ -44,7 +44,7 @@ under the License. <set field="activeApp" value="projectmgr" global="true"/> <set field="applicationMenuName" value="ProjectMgrAppBar" global="true"/> <set field="applicationMenuLocation" value="component://projectmgr/widget/ProjectMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.ProjectMgrApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.ProjectMgrApplication" global="true"/> <set field="my" value="My" global="true"/> </actions> <widgets> Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/CommonScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/scrum/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/widget/CommonScreens.xml Sat Aug 26 20:24:09 2017 @@ -36,7 +36,7 @@ under the License. <set field="activeApp" value="scrum" global="true"/> <set field="applicationMenuName" value="ScrumAppBar" global="true"/> <set field="applicationMenuLocation" value="component://scrum/widget/scrumMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.ScrumApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.ScrumApplication" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/LookupScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/scrum/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/widget/LookupScreens.xml Sat Aug 26 20:24:09 2017 @@ -28,7 +28,7 @@ under the License. <actions> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupCustomerRequest}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupCustomerRequest"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/MyWorkScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/MyWorkScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/scrum/widget/MyWorkScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/widget/MyWorkScreens.xml Sat Aug 26 20:24:09 2017 @@ -35,11 +35,11 @@ under the License. </entity-one> <set field="myTask" value="notNull"/> <set field="my" value="My"/> - <set field="EditWeekTimeshee_size_1" value="${parameters.EditWeekTimeshee_size_1}"/> - <set field="EditWeekTimeshee_index_1" value="${parameters.EditWeekTimeshee_index_1}" default-value="0"/> + <set field="EditWeekTimeshee_size_1" from-field="parameters.EditWeekTimeshee_size_1"/> + <set field="EditWeekTimeshee_index_1" from-field="parameters.EditWeekTimeshee_index_1" default-value="0"/> <set field="url" value="timesheetId=${parameters.timesheetId}&EditWeekTimeshee_size_1=${EditWeekTimeshee_size_1}&EditWeekTimeshee_index_1=${EditWeekTimeshee_index_1}#"/> - <set field="MyTasks_size_1" value="${parameters.MyTasks_size_1}"/> - <set field="MyTasks_index_1" value="${parameters.MyTasks_index_1}" default-value="0"/> + <set field="MyTasks_size_1" from-field="parameters.MyTasks_size_1"/> + <set field="MyTasks_index_1" from-field="parameters.MyTasks_index_1" default-value="0"/> <set field="MyTasks_url" value="timesheetId=${parameters.timesheetId}&MyTasks_size_1=${MyTasks_size_1}&MyTasks_index_1=${MyTasks_index_1}#"/> <set field="timesheetId" from-field="parameters.timesheetId"/> <script location="component://scrum/groovyScripts/EditDailyHourReport.groovy"/> Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/OpenTestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/OpenTestScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/scrum/widget/OpenTestScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/widget/OpenTestScreens.xml Sat Aug 26 20:24:09 2017 @@ -157,7 +157,7 @@ under the License. <set field="titleProperty" value="PageTitleScrumDefaultTasks"/> <set field="headerItem" value="admin"/> <set field="tabButtonItem" value="defaultTasks"/> - <set field="workEffortId" value="${parameters.workEffortId}"/> + <set field="workEffortId" from-field="parameters.workEffortId"/> </actions> <widgets> <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/ResourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/ResourceScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/scrum/widget/ResourceScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/widget/ResourceScreens.xml Sat Aug 26 20:24:09 2017 @@ -269,7 +269,7 @@ under the License. <screen name="PartyRevisions"> <section> <actions> - <set field="title" value="${uiLabelMap.ScrumRevisions}"/> + <set field="title" from-field="uiLabelMap.ScrumRevisions"/> <set field="parameters.custRequestId" from-field="custRequestWorkEffort[0].custRequestId"/> <set field="parameters.noConditionFind" value="Y"/> <entity-condition entity-name="ContentRole" list="contents"> Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/TaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/TaskScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/scrum/widget/TaskScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/widget/TaskScreens.xml Sat Aug 26 20:24:09 2017 @@ -130,7 +130,7 @@ under the License. <screen name="RevisionList"> <section> <actions> - <set field="title" value="${uiLabelMap.ScrumRevisions}"/> + <set field="title" from-field="uiLabelMap.ScrumRevisions"/> <set field="parameters.custRequestId" from-field="custRequestWorkEffort[0].custRequestId"/> <set field="parameters.noConditionFind" value="Y"/> <entity-and entity-name="WorkEffortAndContentDataResource" list="listIt"> Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/demotest/DemotestScreen.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/demotest/DemotestScreen.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/scrum/widget/demotest/DemotestScreen.xml (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/widget/demotest/DemotestScreen.xml Sat Aug 26 20:24:09 2017 @@ -36,7 +36,7 @@ <!-- <set field="activeApp" value="scrum" global="true"/>--> <set field="applicationMenuName" value="MainDemoUser" global="true"/> <set field="applicationMenuLocation" value="component://scrum/widget/scrumMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.ScrumApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.ScrumApplication" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/widget/scrumScreens.xml Sat Aug 26 20:24:09 2017 @@ -734,7 +734,7 @@ under the License. <field-map field-name="productId" from-field="parameters.productId"/> <field-map field-name="roleTypeId" value="PRODUCT_OWNER"/> </entity-and> - <set field="productOwnerId" value="${productRole[0].partyId}"/> + <set field="productOwnerId" from-field="productRole[0].partyId"/> <entity-one entity-name="CommunicationEvent" value-field="parentCom"> <field-map field-name="communicationEventId" from-field="parameters.parentCommEventId"/> </entity-one> @@ -883,7 +883,7 @@ under the License. <field-map field-name="productId" from-field="parameters.productId"/> <field-map field-name="roleTypeId" value="PRODUCT_OWNER"/> </entity-and> - <set field="productOwnerId" value="${productRole[0].partyId}"/> + <set field="productOwnerId" from-field="productRole[0].partyId"/> <entity-one entity-name="CommunicationEvent" value-field="parentCom"> <field-map field-name="communicationEventId" from-field="parameters.parentCommEventId"/> </entity-one> @@ -1095,7 +1095,7 @@ under the License. <field-map field-name="productId" from-field="parameters.productId"/> <field-map field-name="roleTypeId" value="PRODUCT_OWNER"/> </entity-and> - <set field="productOwnerId" value="${productRole[0].partyId}"/> + <set field="productOwnerId" from-field="productRole[0].partyId"/> <entity-one entity-name="CommunicationEvent" value-field="parentCom"> <field-map field-name="communicationEventId" from-field="parameters.parentCommEventId"/> </entity-one> @@ -2060,7 +2060,7 @@ under the License. <field-map field-name="productId" from-field="parameters.productId"/> <field-map field-name="roleTypeId" value="PRODUCT_OWNER"/> </entity-and> - <set field="productOwnerId" value="${productRole[0].partyId}"/> + <set field="productOwnerId" from-field="productRole[0].partyId"/> <entity-one entity-name="CommunicationEvent" value-field="parentCom"> <field-map field-name="communicationEventId" from-field="parameters.parentCommEventId"/> </entity-one> @@ -2122,8 +2122,8 @@ under the License. <actions> <set field="organizationPartyId" from-field="defaultOrganizationPartyId"/> <script location="component://scrum/groovyScripts/ProductEmail.groovy"/> - <set field="communicationEvent.partyIdFrom" value="${partyIdFrom}" /> - <set field="communicationEvent.partyIdTo" value="${partyIdTo}" /> + <set field="communicationEvent.partyIdFrom" from-field="partyIdFrom" /> + <set field="communicationEvent.partyIdTo" from-field="partyIdTo" /> </actions> <widgets/> </section> @@ -2291,8 +2291,8 @@ under the License. <actions> <set field="organizationPartyId" from-field="defaultOrganizationPartyId"/> <script location="component://scrum/groovyScripts/ProductEmail.groovy"/> - <set field="communicationEvent.partyIdFrom" value="${partyIdFrom}" /> - <set field="communicationEvent.partyIdTo" value="${partyIdTo}" /> + <set field="communicationEvent.partyIdFrom" from-field="partyIdFrom" /> + <set field="communicationEvent.partyIdTo" from-field="partyIdTo" /> </actions> <widgets> <container style="lefthalf"> Modified: ofbiz/ofbiz-plugins/trunk/solr/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/widget/CommonScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/solr/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/solr/widget/CommonScreens.xml Sat Aug 26 20:24:09 2017 @@ -31,7 +31,7 @@ under the License. <set field="applicationMenuName" value="SolrAppBar" global="true"/> <set field="applicationMenuLocation" value="component://solr/widget/SolrMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.SolrApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.SolrApplication" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-plugins/trunk/webpos/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/widget/CommonScreens.xml?rev=1806327&r1=1806326&r2=1806327&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/webpos/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/webpos/widget/CommonScreens.xml Sat Aug 26 20:24:09 2017 @@ -39,7 +39,7 @@ under the License. <set field="activeApp" value="webpos" global="true"/> <set field="applicationMenuName" value="WebPosAppBar" global="true"/> <set field="applicationMenuLocation" value="component://webpos/widget/WebPosMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.WebPosMenuMain}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.WebPosMenuMain" global="true"/> <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/jquery.hotkeys-0.7.9.min.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/WebPosHotkeys.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/Shortcuts.js" global="true"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |