You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2017/08/26 20:33:37 UTC
svn commit: r1806329 - in /ofbiz/ofbiz-framework/trunk:
applications/accounting/widget/ applications/commonext/widget/
applications/content/widget/forum/ applications/order/widget/ordermgr/
applications/party/widget/partymgr/ applications/product/widge...
Author: deepak
Date: Sat Aug 26 20:33:37 2017
New Revision: 1806329
URL: http://svn.apache.org/viewvc?rev=1806329&view=rev
Log:
Fixed: Found some more vlaue=dollor pattern in set element.
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlScreens.xml
ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml
ofbiz/ofbiz-framework/trunk/applications/commonext/widget/CommonScreens.xml
ofbiz/ofbiz-framework/trunk/applications/content/widget/forum/ForumScreens.xml
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/CommonScreens.xml
ofbiz/ofbiz-framework/trunk/framework/resources/templates/CommonScreens.xml
Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CommonScreens.xml?rev=1806329&r1=1806328&r2=1806329&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/CommonScreens.xml Sat Aug 26 20:33:37 2017
@@ -39,7 +39,7 @@ under the License.
<set field="activeApp" value="accounting" global="true"/>
<set field="applicationMenuName" value="AccountingAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://accounting/widget/AccountingMenus.xml" global="true"/>
- <set field="applicationTitle" value="${uiLabelMap.AccountingManagerApplication}" global="true"/>
+ <set field="applicationTitle" from-field="uiLabelMap.AccountingManagerApplication" global="true"/>
</actions>
<widgets>
<include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlScreens.xml?rev=1806329&r1=1806328&r2=1806329&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/GlScreens.xml Sat Aug 26 20:33:37 2017
@@ -350,7 +350,7 @@ under the License.
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<set field="titleProperty" value="PageTitleUnpostedTransactions"/>
<set field="tabButtonItem" value="FindAcctgTrans"/>
- <set field="labelTitleProperty" value="${uiLabelMap.PageTitleUnpostedTransactions}"/>
+ <set field="labelTitleProperty" from-field="uiLabelMap.PageTitleUnpostedTransactions"/>
<entity-condition entity-name="AcctgTrans" list="transactions">
<condition-expr field-name="isPosted" operator="not-equals" value="Y"/>
<order-by field-name="transactionDate"/>
@@ -375,7 +375,7 @@ under the License.
<set field="titleProperty" value="AccountingPrintChecks"/>
<set field="tabButtonItem" value="ChecksTabButton"/>
<set field="tabButtonItem2" value="PrintChecksTabButton"/>
- <set field="labelTitleProperty" value="${uiLabelMap.AccountingPrintChecks}"/>
+ <set field="labelTitleProperty" from-field="uiLabelMap.AccountingPrintChecks"/>
<!-- find payments of paymentMethodType PERSONAL_CHECK or COMPANY_CHECK with statusId NOT_PAID -->
<entity-condition entity-name="Payment" list="payments">
Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml?rev=1806329&r1=1806328&r2=1806329&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/widget/LookupScreens.xml Sat Aug 26 20:33:37 2017
@@ -27,7 +27,7 @@ under the License.
</condition>
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="${uiLabelMap.AccountingLookupPayment}"/>
+ <set field="title" from-field="uiLabelMap.AccountingLookupPayment"/>
<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.AccountingLookupInvoices}"/>
+ <set field="title" from-field="uiLabelMap.AccountingLookupInvoices"/>
<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"/>
@@ -81,7 +81,7 @@ under the License.
</condition>
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="${uiLabelMap.PageTitleLookupFixedAsset}"/>
+ <set field="title" from-field="uiLabelMap.PageTitleLookupFixedAsset"/>
<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"/>
@@ -109,7 +109,7 @@ under the License.
</condition>
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="${uiLabelMap.PageTitleLookupBillingAccount}"/>
+ <set field="title" from-field="uiLabelMap.PageTitleLookupBillingAccount"/>
<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"/>
@@ -137,7 +137,7 @@ under the License.
</condition>
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="${uiLabelMap.PageTitleLookupGlAccount}"/>
+ <set field="title" from-field="uiLabelMap.PageTitleLookupGlAccount"/>
<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"/>
@@ -165,7 +165,7 @@ under the License.
</condition>
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="${uiLabelMap.AccountingLookupAgreement}"/>
+ <set field="title" from-field="uiLabelMap.AccountingLookupAgreement"/>
<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"/>
@@ -193,7 +193,7 @@ under the License.
</condition>
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="${uiLabelMap.AccountingLookupAgreementItem}"/>
+ <set field="title" from-field="uiLabelMap.AccountingLookupAgreementItem"/>
<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"/>
@@ -221,7 +221,7 @@ under the License.
</condition>
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="${uiLabelMap.AccountingLookupPaymentGroupMember}"/>
+ <set field="title" from-field="uiLabelMap.AccountingLookupPaymentGroupMember"/>
<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"/>
@@ -249,7 +249,7 @@ under the License.
</condition>
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="${uiLabelMap.AccountingLookupGlReconciliations}"/>
+ <set field="title" from-field="uiLabelMap.AccountingLookupGlReconciliations"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
<set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
@@ -273,7 +273,7 @@ under the License.
<section>
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="${uiLabelMap.PageTitleLookupCustomTimePeriod}"/>
+ <set field="title" from-field="uiLabelMap.PageTitleLookupCustomTimePeriod"/>
<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-framework/trunk/applications/commonext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/widget/CommonScreens.xml?rev=1806329&r1=1806328&r2=1806329&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/commonext/widget/CommonScreens.xml Sat Aug 26 20:33:37 2017
@@ -57,7 +57,7 @@ under the License.
<section>
<condition><not><if-empty field="PartyAcctgPrefAndGroupList"/></not></condition><!-- produced by ChangeOrgPartyId.groovy-->
<actions>
- <set field="defaultOrganizationPartyId" value="${userPreferences.ORGANIZATION_PARTY}" global="true"/>
+ <set field="defaultOrganizationPartyId" from-field="userPreferences.ORGANIZATION_PARTY" global="true"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" default-value="${userPreferences.ORGANIZATION_PARTY}" global="true" to-scope="user"/>
<property-to-field resource="general" property="currency.uom.id.default" field="defaultCurrencyUomId"/>
<entity-one entity-name="PartyAcctgPrefAndGroup" value-field="orgParty">
Modified: ofbiz/ofbiz-framework/trunk/applications/content/widget/forum/ForumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/widget/forum/ForumScreens.xml?rev=1806329&r1=1806328&r2=1806329&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/widget/forum/ForumScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/widget/forum/ForumScreens.xml Sat Aug 26 20:33:37 2017
@@ -26,7 +26,7 @@ under the License.
<actions>
<set field="headerItem" value="Forum"/>
<property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="pageTitle" value="${uiLabelMap.${titleProperty}}"/>
+ <set field="pageTitle" from-field="uiLabelMap.[titleProperty]"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
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=1806329&r1=1806328&r2=1806329&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/RequirementScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Sat Aug 26 20:33:37 2017
@@ -153,7 +153,7 @@ under the License.
<section>
<actions>
<set field="genericLinkName" value="print"/>
- <set field="genericLinkText" value="${uiLabelMap.CommonPrint}"/>
+ <set field="genericLinkText" from-field="uiLabelMap.CommonPrint"/>
<set field="genericLinkTarget" value="ApprovedProductRequirementsReport"/>
<set field="genericLinkStyle" value="buttontext"/>
<set field="genericLinkWindow" value="reportWindow"/>
Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=1806329&r1=1806328&r2=1806329&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyScreens.xml Sat Aug 26 20:33:37 2017
@@ -1233,7 +1233,7 @@ under the License.
<screen name="CreateUserNotification">
<section>
<actions>
- <set field="title" value="${uiLabelMap.MyPortalCustRequestNotificationMailCreation}"/>
+ <set field="title" from-field="uiLabelMap.MyPortalCustRequestNotificationMailCreation"/>
</actions>
<widgets>
<platform-specific><html><html-template location="component://party/template/email/CreatePartyNotification.ftl"/></html></platform-specific>
Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1806329&r1=1806328&r2=1806329&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/CommonScreens.xml Sat Aug 26 20:33:37 2017
@@ -40,7 +40,7 @@ under the License.
<set field="activeApp" value="catalogmgr" global="true"/>
<set field="applicationMenuName" value="CatalogAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://product/widget/catalog/CatalogMenus.xml" global="true"/>
- <set field="applicationTitle" value="${uiLabelMap.ProductCatalogManagerApplication}" global="true"/>
+ <set field="applicationTitle" from-field="uiLabelMap.ProductCatalogManagerApplication" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery.cookie-1.4.0.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/>
</actions>
Modified: ofbiz/ofbiz-framework/trunk/framework/resources/templates/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/resources/templates/CommonScreens.xml?rev=1806329&r1=1806328&r2=1806329&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/resources/templates/CommonScreens.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/resources/templates/CommonScreens.xml Sat Aug 26 20:33:37 2017
@@ -14,7 +14,7 @@
<set field="activeApp" value="@webapp-name@" global="true"/>
<set field="applicationMenuName" value="MainAppBar" global="true"/>
<set field="applicationMenuLocation" value="component://@component-name@/widget/@component-resource-name@Menus.xml" global="true"/>
- <set field="applicationTitle" value="${uiLabelMap.@component-resource-name@Application}" global="true"/>
+ <set field="applicationTitle" from-field="uiLabelMap.@component-resource-name@Application" global="true"/>
</actions>
<widgets>
<include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>