svn commit: r1814928 - in /ofbiz/ofbiz-framework/trunk/applications/marketing: servicedef/services.xml widget/ContactListForms.xml

[Deepak Dixit-5]

Author: deepak
Date: Sat Nov 11 08:47:12 2017
New Revision: 1814928

URL: http://svn.apache.org/viewvc?rev=1814928&view=rev
Log:
Fixed: Party Id field missing while creating contact list party in the marketing component (OFBIZ-9698)
Thanks Rubia Elza Joshep for reporting the issue.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml
    ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml?rev=1814928&r1=1814927&r2=1814928&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services.xml Sat Nov 11 08:47:12 2017
@@ -191,7 +191,8 @@ under the License.
             location="component://marketing/minilang/marketing/contact/ContactListServices.xml" invoke="updateContactListParty" auth="true">
         <description>Update Party to ContactList Join</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
-        <auto-attributes include="nonpk" mode="IN" optional="true"/>        
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+        <attribute name="contactListId" type="String" mode="OUT" optional="true"/>
         <attribute name="productStoreId" type="String" mode="INOUT" optional="true"/>
         <attribute name="optInVerifyCode" type="String" mode="IN" optional="true"/>
         <attribute name="baseLocation" type="String" mode="IN" optional="true"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml?rev=1814928&r1=1814927&r2=1814928&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/marketing/widget/ContactListForms.xml Sat Nov 11 08:47:12 2017
@@ -147,11 +147,11 @@ under the License.
         <alt-target use-when="contactListParty==null" target="createContactListParty"/>
 
         <field name="contactListId"><hidden/></field>
-        <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time default-value="${groovy: org.apache.ofbiz.base.util.UtilDateTime.nowTimestamp()}"/></field>
+        <field name="partyId" use-when="contactListParty==null" title="${uiLabelMap.MarketingContactListPartyId}" required-field="true"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyId" use-when="contactListParty!=null"><display/></field>
+        <field name="fromDate" use-when="contactListParty==null" title="${uiLabelMap.CommonFromDate}" required-field="true"><date-time default-value="${groovy: org.apache.ofbiz.base.util.UtilDateTime.nowTimestamp()}"/></field>
+        <field name="fromDate" use-when="contactListParty!=null"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
-        <field use-when="partyId!=null" name="partyId"><display/></field>
-        <field use-when="fromDate!=null" name="fromDate"><display/></field>
 
         <field name="statusId" title="${uiLabelMap.CommonStatus}">
             <drop-down no-current-selected-key="CLPT_ACCEPTED">
@@ -167,8 +167,8 @@ under the License.
             <lookup target-form-name="LookupPreferredContactMech" target-parameter="partyId"/>
         </field>
 
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field use-when="partyId!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
+        <field name="submitButton" use-when="contactListParty==null" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
+        <field name="submitButton" use-when="contactListParty!=null" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink description="${uiLabelMap.CommonCancelDone}" target="${donePage}" also-hidden="false"/></field>
      </form>