svn commit: r1807598 - in /ofbiz/branches/release16.11: ./ applications/marketing/webapp/sfa/WEB-INF/controller.xml applications/marketing/widget/sfa/forms/LeadForms.xml

[akashjain]

Author: akashjain
Date: Thu Sep  7 12:35:34 2017
New Revision: 1807598

URL: http://svn.apache.org/viewvc?rev=1807598&view=rev
Log:
Applied fix from trunk for revision: 1807597
===

 Fixed: Creating Lead Source from profile page it redirects to empty profile page, applied patch from jira issue (OFBIZ-9553)
Additional change: dataSourceId made a required field.
Thanks  Aditya Sharma for your contribution


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/marketing/webapp/sfa/WEB-INF/controller.xml
    ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/LeadForms.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep  7 12:35:34 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804319,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804319,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/applications/marketing/webapp/sfa/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/webapp/sfa/WEB-INF/controller.xml?rev=1807598&r1=1807597&r2=1807598&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/marketing/webapp/sfa/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release16.11/applications/marketing/webapp/sfa/WEB-INF/controller.xml Thu Sep  7 12:35:34 2017
@@ -142,7 +142,14 @@ under the License.
     <request-map uri="createLeadPartyDataSource">
         <security https="true" auth="true"/>
         <event type="service" invoke="createPartyDataSource"/>
-        <response name="success" type="request" value="viewprofile"/>
+        <response name="success" type="request-redirect" value="viewprofile">
+            <redirect-parameter name="partyId"/>
+            <redirect-parameter name="roleTypeId"/>
+        </response>
+        <response name="error" type="request-redirect" value="viewprofile">
+            <redirect-parameter name="partyId"/>
+            <redirect-parameter name="roleTypeId"/>
+        </response>
     </request-map>
     <request-map uri="AddRelatedCompany">
         <security https="true" auth="true"/>

Modified: ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/LeadForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=1807598&r1=1807597&r2=1807598&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/LeadForms.xml (original)
+++ ofbiz/branches/release16.11/applications/marketing/widget/sfa/forms/LeadForms.xml Thu Sep  7 12:35:34 2017
@@ -135,7 +135,8 @@ under the License.
     <form name="AddLeadPartyDataSource" type="single" target="createLeadPartyDataSource">
         <auto-fields-service service-name="createPartyDataSource"/>
         <field name="partyId"><hidden/></field>
-        <field name="dataSourceId" title="${uiLabelMap.SfaLeadSource}">
+        <field name="roleTypeId"><hidden/></field>
+        <field name="dataSourceId" title="${uiLabelMap.SfaLeadSource}" required-field="true">
             <drop-down allow-empty="true">
                 <entity-options entity-name="DataSource" key-field-name="dataSourceId" description="${dataSourceId} - ${description}">
                     <entity-constraint name="dataSourceTypeId" operator="equals" value="LEAD_SOURCE"/>