svn commit: r996090 - in /ofbiz/trunk: applications/accounting/widget/ applications/accounting/widget/ap/ applications/accounting/widget/ar/ applications/commonext/widget/ applications/order/widget/ordermgr/ applications/party/widget/partymgr/ applicat...

[buscob]

Author: buscob
Date: Sat Sep 11 07:10:50 2010
New Revision: 996090

URL: http://svn.apache.org/viewvc?rev=996090&view=rev
Log:
Added UiLabels resources loading in Porlets.
This fixes the missing portlet UILabels rendering when accessing the Portal Page Admin in WebTools.

Modified:
    ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
    ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
    ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
    ofbiz/trunk/applications/commonext/widget/SystemInfoScreens.xml
    ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
    ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
    ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
    ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
    ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Sat Sep 11 07:10:50 2010
@@ -280,6 +280,7 @@ under the License.
     <screen name="ListBankAccount">
         <section>
             <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="parameters.finAccountTypeId" value="BANK_ACCOUNT"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sat Sep 11 07:10:50 2010
@@ -540,6 +540,7 @@ under the License.
     <screen name="ListCustomerInvoices">
         <section>
             <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy"/>
                 <entity-condition list="invoices" entity-name="Invoice">
                     <condition-list combine="and">

Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Sat Sep 11 07:10:50 2010
@@ -66,6 +66,7 @@ under the License.
     <screen name="ApPastDueInvoices">
         <section>
            <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="invoices" from-field="PastDueInvoices"/>
             </actions>
             <widgets>
@@ -78,6 +79,7 @@ under the License.
     <screen name="ApInvoicesDueSoon">
         <section>
             <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="invoices" from-field="InvoicesDueSoon"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Sat Sep 11 07:10:50 2010
@@ -68,6 +68,7 @@ under the License.
     <screen name="ArPastDueInvoices">
         <section>
            <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="invoices" from-field="PastDueInvoices"/>
             </actions>
             <widgets>
@@ -80,6 +81,7 @@ under the License.
     <screen name="ArInvoicesDueSoon">
         <section>
             <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="invoices" from-field="InvoicesDueSoon"/>
             </actions>
             <widgets>

Modified: ofbiz/trunk/applications/commonext/widget/SystemInfoScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/SystemInfoScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/SystemInfoScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/SystemInfoScreens.xml Sat Sep 11 07:10:50 2010
@@ -24,8 +24,8 @@ under the License.
     <screen name="SystemInfoNotes">
         <section>
             <actions>
-                <service service-name="getSystemInfoNotes"
-                    result-map="resultMap"/>
+                <property-map resource="CommonExtUiLabels" map-name="uiLabelMap" global="true"/>
+                <service service-name="getSystemInfoNotes" result-map="resultMap"/>
                 <set field="systemInfoNotes" from-field="resultMap.systemInfoNotes"/>
             </actions>
             <widgets>
@@ -55,6 +55,7 @@ under the License.
     <screen name="SystemInfoStatus">
         <section>
             <actions>
+                <property-map resource="CommonExtUiLabels" map-name="uiLabelMap" global="true"/>
                 <service service-name="getSystemInfoStatus" result-map="resultMap"/>
                 <set field="systemInfoStatus" from-field="resultMap.systemInfoStatus"/>
             </actions>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestScreens.xml Sat Sep 11 07:10:50 2010
@@ -490,6 +490,7 @@ under the License.
     <screen name="IncomingCustRequests">
         <section>
             <actions>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
                 <entity-condition list="custRequests" entity-name="CustReqAndTypeAndPartyRel">
                     <condition-list combine="and">
                         <condition-expr field-name="statusId" operator="equals" value="CRQ_SUBMITTED"/>
@@ -520,6 +521,7 @@ under the License.
     <screen name="ListCustRequests">
         <section>
             <actions>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
                 <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
                 <set field="fromPartyId" from-field="userLogin.partyId"/>
             </actions>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderViewScreens.xml Sat Sep 11 07:10:50 2010
@@ -475,6 +475,7 @@ under the License.
     <screen name="ListCustomerOrders">
         <section>
             <actions>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="partyId" from-field="userLogin.partyId"/>
                 <set field="statusId" from-field="statusId"/>
@@ -493,6 +494,7 @@ under the License.
     <screen name="ListSalesOrders">
         <section>
             <actions>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="filterDate" type="Timestamp" value="${nowTimestamp}"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderList.groovy"/>
             </actions>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportScreens.xml Sat Sep 11 07:10:50 2010
@@ -42,6 +42,11 @@ under the License.
 
     <screen name="OrderReportSalesByStore">
         <section>
+            <actions>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
             <widgets>
                 <screenlet title="${uiLabelMap.OrderReportSalesByStore}">
                     <include-form name="SalesByStoreReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
@@ -52,6 +57,10 @@ under the License.
 
     <screen name="OrderReportOpenOrderItems">
         <section>
+            <actions>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
             <widgets>
                 <screenlet title="${uiLabelMap.OrderReportOpenOrderItems}">
                     <include-form name="OpenOrderItemsReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
@@ -62,6 +71,10 @@ under the License.
 
     <screen name="OrderReportPurchasesByOrganization">
         <section>
+            <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
             <widgets>
                 <screenlet title="${uiLabelMap.OrderReportPurchasesByOrganization}">
                     <include-form name="PurchasesByOrganizationReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
@@ -72,6 +85,10 @@ under the License.
 
     <screen name="OrderReportPurchasesByProduct">
         <section>
+            <actions>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
             <widgets>
                 <screenlet title="${uiLabelMap.OrderReportPurchasesByProduct}">
                     <include-form name="OrderPurchaseProductOptions" location="component://order/widget/ordermgr/ReportForms.xml"/>
@@ -82,6 +99,10 @@ under the License.
 
     <screen name="OrderReportPurchasesByPaymentMethod">
         <section>
+            <actions>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
             <widgets>
                 <screenlet title="${uiLabelMap.OrderReportPurchasesByPaymentMethod}">
                     <include-form name="OrderPurchasePaymentOptions" location="component://order/widget/ordermgr/ReportForms.xml"/>
@@ -93,6 +114,9 @@ under the License.
     <!--New Screen-->
     <screen name="SalesReport">
         <section>
+            <actions>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
             <widgets>
                 <screenlet title="Sales Report">
                     <include-form name="SalesReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
@@ -103,6 +127,9 @@ under the License.
 
     <screen name="NetBeforeOverheadReport">
         <section>
+            <actions>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
             <widgets>
                 <screenlet title="Net Before Overhead Report">
                     <include-form name="NetBeforeOverheadReport" location="component://order/widget/ordermgr/ReportForms.xml"/>
@@ -113,6 +140,9 @@ under the License.
     
     <screen name="ProductDemandReport">
         <section>
+            <actions>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+            </actions>
             <widgets>
                 <screenlet title="Product Demand Report">
                     <include-form name="ProductDemandReport" location="component://order/widget/ordermgr/ReportForms.xml"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Sat Sep 11 07:10:50 2010
@@ -838,6 +838,7 @@ under the License.
     <screen name="MyCommunicationEvents">
         <section>
             <actions>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
                 <set field="internalNotesOnly" from-field="internalNotesOnly" default-value="false"/>
                 <set field="partyId" from-field="communicationPartyId" default-value="${userLogin.partyId}"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Sat Sep 11 07:10:50 2010
@@ -159,6 +159,7 @@
         <section>
             <actions>
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetPaymentMethods.groovy"/>
             </actions>
             <widgets>
@@ -499,6 +500,7 @@
     <screen name="partyRelContacts">
         <section>
             <actions>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <entity-one entity-name="Party" value-field="party"></entity-one>
                 <entity-and list="contacts" entity-name="PartyRelationship" filter-by-date="true">
                     <field-map field-name="partyIdFrom" from-field="parameters.partyId"/>

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Sat Sep 11 07:10:50 2010
@@ -1215,6 +1215,7 @@ under the License.
     <screen name="BestSellingProducts">
         <section>
             <actions>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="filterDate" type="Timestamp" from-field="nowTimestamp"/>
                 <script location="component://product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy"/>
             </actions>

Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Sat Sep 11 07:10:50 2010
@@ -24,6 +24,7 @@ under the License.
     <screen name="Calendar">
         <section>
             <actions>
+                <property-map resource="WorkeffortUiLabels" map-name="uiLabelMap" global="true"/>
                 <script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
                 <set field="parameters.period" from-field="parameters.period" default-value="${initialView}"/>
                 <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/CreateUrlParam.groovy"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sat Sep 11 07:10:50 2010
@@ -1029,6 +1029,7 @@ under the License.
     <screen name="ListCustomerProjects">
         <section>
             <actions>
+                <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/images/jsgantt.js" global="true"/>
                 <set field="layoutSettings.styleSheets[]" value="/images/jsgantt.css" global="true"/>
                 <entity-condition list="projects" entity-name="WorkEffortPartyAssignByGroup" filter-by-date="true">

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=996090&r1=996089&r2=996090&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Sat Sep 11 07:10:50 2010
@@ -203,6 +203,7 @@ under the License.
     <screen name="CurrentTimesheet">
         <section>
             <actions>
+                <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
                 <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy"/>
             </actions>
             <widgets>