svn commit: r1159524 - in /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce: WEB-INF/actions/customer/ContactList.groovy customer/miniSignUpForContactList.ftl

[hansbak-2]

Author: hansbak
Date: Fri Aug 19 07:45:28 2011
New Revision: 1159524

URL: http://svn.apache.org/viewvc?rev=1159524&view=rev
Log:
adapt the ecommerce component to the new websitecontactlist datamodel

Modified:
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy?rev=1159524&r1=1159523&r2=1159524&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ContactList.groovy Fri Aug 19 07:45:28 2011
@@ -44,7 +44,11 @@ webSiteContactList = delegator.findList(
 
 publicEmailContactLists = [];
 webSiteContactList.each { webSiteContactList ->
-    temp = webSiteContactList.getRelatedOne("ContactList");
+    contactList = webSiteContactList.getRelatedOne("ContactList");
+    contactListType = contactList.getRelatedOne("ContactListType");
+    temp = [:];
+    temp.contactList = contactList;
+    temp.contactListType = contactListType;
     publicEmailContactLists.add(temp);
 }
 context.publicEmailContactLists = publicEmailContactLists;

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl?rev=1159524&r1=1159523&r2=1159524&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Fri Aug 19 07:45:28 2011
@@ -21,8 +21,8 @@ under the License.
 <#macro contactList publicEmailContactLists>
   <select name="contactListId" class="selectBox" style="width:134px">
     <#list publicEmailContactLists as publicEmailContactList>
-      <#assign publicContactMechType = publicEmailContactList.getRelatedOneCache("ContactMechType")?if_exists>
-        <option value="${publicEmailContactList.contactListId}">${publicEmailContactList.contactListName?if_exists}</option>
+      <#assign publicContactMechType = publicEmailContactList.contactList.getRelatedOneCache("ContactMechType")?if_exists>
+        <option value="${publicEmailContactList.contactList.contactListId}">${publicEmailContactList.contactListType.description?if_exists} - ${publicEmailContactList.contactList.contactListName?if_exists}</option>
     </#list>
   </select>
 </#macro>