Author: hansbak
Date: Fri Oct 2 07:16:05 2009
New Revision: 820913
URL:
http://svn.apache.org/viewvc?rev=820913&view=revLog:
if the contact mech is not provided when a party is added to a contact list, find it and use that, also set the default status to accepted if added in the backoffice
Modified:
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=820913&r1=820912&r2=820913&view=diff==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Fri Oct 2 07:16:05 2009
@@ -103,6 +103,13 @@
<!-- okay, now check for all errors -->
<check-errors/>
+ <!-- get party email address if not provided -->
+ <if-empty field="parameters.contactMechId">
+ <set field="partyEmail.partyId" from-field="parameters.partyId"/>
+ <call-service service-name="getPartyEmail" in-map-name="partyEmail">
+ <result-to-field result-name="contactMechId" field="parameters.preferredContactMechId"/>
+ </call-service>
+ </if-empty>
<make-value entity-name="ContactListParty" value-field="newEntity"/>
<set-nonpk-fields map="parameters" value-field="newEntity"/>
Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml?rev=820913&r1=820912&r2=820913&view=diff==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Fri Oct 2 07:16:05 2009
@@ -154,7 +154,7 @@
<field use-when="fromDate!=null" name="fromDate" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}">
- <drop-down no-current-selected-key="CLPT_PENDING">
+ <drop-down no-current-selected-key="CLPT_ACCEPTED">
<entity-options entity-name="StatusItem" description="${description}">
<entity-constraint name="statusTypeId" value="CONTACTLST_PARTY" operator="equals"/>
<entity-order-by field-name="description"/>