svn commit: r1806278 - in /ofbiz/ofbiz-framework/trunk/applications/marketing: minilang/sfa/lead/LeadServices.xml webapp/sfa/WEB-INF/controller.xml

[Arun Patidar-4]

Author: arunpatidar
Date: Sat Aug 26 09:24:13 2017
New Revision: 1806278

URL: http://svn.apache.org/viewvc?rev=1806278&view=rev
Log:
When creating New Lead, Lead Source should be associated with the Lead. (OFBIZ-9588)
Thanks Aditya Sharma for your contribution.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/sfa/lead/LeadServices.xml
    ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/sfa/lead/LeadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/sfa/lead/LeadServices.xml?rev=1806278&r1=1806277&r2=1806278&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/sfa/lead/LeadServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/minilang/sfa/lead/LeadServices.xml Sat Aug 26 09:24:13 2017
@@ -113,12 +113,12 @@
             <set field="partyRelationshipCtx.roleTypeIdTo" value="ACCOUNT_LEAD"/>
             <set field="partyRelationshipCtx.partyRelationshipTypeId" value="LEAD_OWNER"/>
             <call-service service-name="createPartyRelationship" in-map-name="partyRelationshipCtx"/>
-            <if-not-empty field="parameters.dataSourceId">
-                <set field="partyDataSourceCtx.partyId" from-field="partyGroupPartyId"/>
-                <set field="partyDataSourceCtx.dataSourceId" from-field="parameters.dataSourceId"/>
-                <call-service service-name="createPartyDataSource" in-map-name="partyDataSourceCtx"/>
-            </if-not-empty>
-
+        </if-not-empty>
+        <if-not-empty field="parameters.dataSourceId">
+            <set field="partyDataSourceCtx.partyId" from-field="leadContactPartyId"/>
+            <set field="partyDataSourceCtx.dataSourceId" from-field="parameters.dataSourceId"/>
+            <call-service service-name="createPartyDataSource" in-map-name="partyDataSourceCtx"/>
+            <check-errors/>
         </if-not-empty>
 
         <field-to-result field="leadContactPartyId" result-name="partyId" />

Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml?rev=1806278&r1=1806277&r2=1806278&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/sfa/WEB-INF/controller.xml Sat Aug 26 09:24:13 2017
@@ -95,8 +95,11 @@ under the License.
     <request-map uri="createLead">
         <security https="true" auth="true"/>
         <event type="service" invoke="createLead"/>
-        <response name="success" type="request" value="viewprofile"/>
-        <response name="error" type="view" value="NewLead"/>
+        <response name="success" type="request-redirect" value="viewprofile">
+            <redirect-parameter name="partyId"/>
+            <redirect-parameter name="roleTypeId"/>
+        </response>
+        <response name="error" type="request-redirect" value="NewLead"/>
     </request-map>
     <request-map uri="ConvertLead">
         <security https="true" auth="true"/>