svn commit: r1037568 - in /ofbiz/branches/release10.04: ./ applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml

Author: jleroux
Date: Sun Nov 21 21:45:15 2010
New Revision: 1037568

URL: http://svn.apache.org/viewvc?rev=1037568&view=rev
Log:
"Applied fix from trunk for revision: 1037567  "
------------------------------------------------------------------------
r1037567 | jleroux | 2010-11-21 22:40:39 +0100 (dim., 21 nov. 2010) | 8 lines

A patch from Willem Janssen "Error in service signUpForContactList" (https://issues.apache.org/jira/browse/OFBIZ-4001) - OFBIZ-4001

The service signUpForContactList does not store the email address of the new entry to the list, instead it uses the email address of the first partyId NA to store to the list.

The service signUpForContactList calls service createContactListParty that has a check on a missing contactMechId. However this parameter is not a parameter that is used by the signUpForContactList service. So the check on the contactMechId has always the same result, it is missing!

signUpForContactList uses parameter prefferedContactMechId so I made a patch that adds the check on this parameter to createContactListParty.

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 21 21:45:15 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567

Modified: ofbiz/branches/release10.04/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=1037568&r1=1037567&r2=1037568&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/branches/release10.04/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Sun Nov 21 21:45:15 2010
@@ -104,12 +104,14 @@ under the License.
         <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>
+        <if-empty field="parameters.preferredContactMechId">
+            <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>
+        </if-empty>    
 
         <make-value entity-name="ContactListParty" value-field="newEntity"/>
         <set-nonpk-fields map="parameters" value-field="newEntity"/>