Author: deepak
Date: Sat Aug 27 13:53:17 2016
New Revision: 1758033
URL: http://svn.apache.org/viewvc?rev=1758033&view=rev
Log:
(OFBIZ-7620) Applied patch from jira issue
================================
Add "changeByUserLoginId" field for ContactListCommStatus
================================
Thanks Nameet for your contribution.
Modified:
ofbiz/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml
ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml
ofbiz/trunk/applications/marketing/servicedef/services.xml
Modified: ofbiz/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml?rev=1758033&r1=1758032&r2=1758033&view=diff
==============================================================================
--- ofbiz/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml
(original)
+++ ofbiz/trunk/applications/datamodel/entitydef/marketing-entitymodel.xml Sat
Aug 27 13:53:17 2016
@@ -211,6 +211,7 @@ under the License.
<field name="partyId" type="id"></field>
<field name="messageId" type="value"></field>
<field name="statusId" type="id-ne"></field>
+ <field name="changeByUserLoginId" type="id-vlong"></field>
<prim-key field="contactListId"/>
<prim-key field="communicationEventId"/>
<prim-key field="contactMechId"/>
@@ -229,6 +230,9 @@ under the License.
<relation type="one" fk-name="CNCT_LST_CST_ST"
rel-entity-name="StatusItem">
<key-map field-name="statusId"/>
</relation>
+ <relation type="one" fk-name="CNCT_LST_CST_ST_UL" title="ChangeBy"
rel-entity-name="UserLogin">
+ <key-map field-name="changeByUserLoginId"
rel-field-name="userLoginId"/>
+ </relation>
<index name="CNTLSTCST_MSG_ID" unique="true">
<index-field name="messageId"/>
</index>
Modified:
ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml?rev=1758033&r1=1758032&r2=1758033&view=diff
==============================================================================
---
ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml
(original)
+++
ofbiz/trunk/applications/marketing/minilang/marketing/contact/ContactListServices.xml
Sat Aug 27 13:53:17 2016
@@ -470,9 +470,11 @@ under the License.
<make-value entity-name="ContactListCommStatus"
value-field="lookedUpValue"/>
<set-pk-fields map="parameters" value-field="lookedUpValue"/>
<set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
+ <set field="lookedUpValue.changeByUserLoginId"
from-field="userLogin.userLoginId"/>
<create-value value-field="lookedUpValue"/>
<else>
<set-nonpk-fields map="parameters"
value-field="lookedUpValue"/>
+ <set field="lookedUpValue.changeByUserLoginId"
from-field="userLogin.userLoginId"/>
<store-value value-field="lookedUpValue"/>
</else>
</if-empty>
Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=1758033&r1=1758032&r2=1758033&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services.xml Sat Aug 27
13:53:17 2016
@@ -224,7 +224,9 @@ under the License.
<!-- ContactList Comm Status Services -->
<service name="updateContactListCommStatus" engine="simple"
default-entity-name="ContactListCommStatus"
location="component://marketing/minilang/marketing/contact/ContactListServices.xml"
invoke="updateContactListCommStatus">
- <auto-attributes include="all" mode="IN" optional="false"/>
+ <auto-attributes include="all" mode="IN" optional="false">
+ <exclude field-name="changeByUserLoginId"/>
+ </auto-attributes>
<override name="partyId" optional="true"/>
<override name="messageId" allow-html="any" optional="true"/>
</service>
