svn commit: r1618572 - in /ofbiz/branches/release12.04: ./ applications/order/widget/ordermgr/OrderViewScreens.xml applications/party/webapp/partymgr/js/PartyProfileContent.js

Author: jleroux
Date: Mon Aug 18 10:18:29 2014
New Revision: 1618572

URL: http://svn.apache.org/r1618572
Log:
"Applied fix from trunk for revision: 1618570"
------------------------------------------------------------------------
r1618570 | jleroux | 2014-08-18 12:17:45 +0200 (lun. 18 août 2014) | 1 ligne

[Rhino] Trailing comma is not legal in an ECMA-262 object initializer
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/order/widget/ordermgr/OrderViewScreens.xml
    ofbiz/branches/release12.04/applications/party/webapp/partymgr/js/PartyProfileContent.js

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1618570

Modified: ofbiz/branches/release12.04/applications/order/widget/ordermgr/OrderViewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1618572&r1=1618571&r2=1618572&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/widget/ordermgr/OrderViewScreens.xml (original)
+++ ofbiz/branches/release12.04/applications/order/widget/ordermgr/OrderViewScreens.xml Mon Aug 18 10:18:29 2014
@@ -57,6 +57,7 @@ under the License.
                 <set field="layoutSettings.javaScripts[]" value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderViewWebSecure.groovy"/>
+                <property-map resource="CommonEntityLabels" map-name="uiLabelMap" global="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOrderViewDecorator">

Modified: ofbiz/branches/release12.04/applications/party/webapp/partymgr/js/PartyProfileContent.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/party/webapp/partymgr/js/PartyProfileContent.js?rev=1618572&r1=1618571&r2=1618572&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/party/webapp/partymgr/js/PartyProfileContent.js (original)
+++ ofbiz/branches/release12.04/applications/party/webapp/partymgr/js/PartyProfileContent.js Mon Aug 18 10:18:29 2014
@@ -24,7 +24,7 @@ var uiLabelJsonObject = null;
 jQuery(document).ready(function() {
 
     var labelObject = {
-            "CommonUiLabels" : ["CommonUpload", "CommonSave", "CommonCompleted"],
+            "CommonUiLabels" : ["CommonUpload", "CommonSave", "CommonCompleted"]
           };
 
     uiLabelJsonObjects = getJSONuiLabels(labelObject);