svn commit: r1335353 - in /ofbiz/branches/release11.04: ./ specialpurpose/ecommerce/data/DemoProduct.xml

Author: jleroux
Date: Tue May  8 06:33:04 2012
New Revision: 1335353

URL: http://svn.apache.org/viewvc?rev=1335353&view=rev
Log:
"Applied fix from trunk for revision: 1335351  " conflict handled by hand
------------------------------------------------------------------------
r1335351 | jleroux | 2012-05-08 08:29:08 +0200 (mar., 08 mai 2012) | 3 lines

A patch from Ankit Jain "Fixes js issue due to bad demo data" https://issues.apache.org/jira/browse/OFBIZ-4566

On the edit contact mech page (https://localhost:8443/ecommerce/control/editcontactmech?contactMechId=10001) coming from profile page, there was one js error (in console)
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/specialpurpose/ecommerce/data/DemoProduct.xml

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1335351

Modified: ofbiz/branches/release11.04/specialpurpose/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1335353&r1=1335352&r2=1335353&view=diff
==============================================================================
--- ofbiz/branches/release11.04/specialpurpose/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/branches/release11.04/specialpurpose/ecommerce/data/DemoProduct.xml Tue May  8 06:33:04 2012
@@ -129,8 +129,8 @@ under the License.
     <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="[hidden email]"/>
     <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_EMAIL_TEMPLATE" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListEmailTemplate"/>
 
-    <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="GOOGLE_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from google analytics" contentId="GOOGLE_ANA_CNT"/>
-    <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from bing analytics" contentId="BING_ANA_CNT"/>
+    <WebAnalyticsConfig webSiteId="WebStore" webAnalyticsTypeId="GOOGLE_ANALYTICS" webAnalyticsCode="//--  enter here your analytic script code --"/>
+    <WebAnalyticsConfig webSiteId="WebStore" webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="//--  enter here your analytic script code --"/>
 
     <ProductStoreFacility productStoreId="9000" facilityId="WebStoreWarehouse" fromDate="2001-05-13 12:00:00.0"/>
     <ProductStoreRole partyId="admin" roleTypeId="SALES_REP" productStoreId="9000" fromDate="2001-05-13 12:00:00.0"/>