You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/11/15 07:47:53 UTC
svn commit: r1714408 - in /ofbiz/branches:
release12.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
release13.07/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
Author: jleroux
Date: Sun Nov 15 06:47:53 2015
New Revision: 1714408
URL: http://svn.apache.org/viewvc?rev=1714408&view=rev
Log:
Reverts
r1711038 in R13.07
r1711040 in R12.04
>From Hans's comment at OFBIZ-6703 "Cannot create more than one lead in the SFA component by same user"
Revert in R14.12 was not a good idea, it would be missing there, r1622161 was committed 03/Sep/14 for OFBIZ-5750 "Convert Party entites CRUD service from simple to entity-auto" before R14.2 was created
Modified:
ofbiz/branches/release12.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
Modified: ofbiz/branches/release12.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=1714408&r1=1714407&r2=1714408&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original)
+++ ofbiz/branches/release12.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Sun Nov 15 06:47:53 2015
@@ -40,17 +40,7 @@
<check-errors/>
<set field="createPartyRoleCtx.partyId" from-field="userLogin.partyId"/>
<set field="createPartyRoleCtx.roleTypeId" value="OWNER"/>
-
- <!-- PartyRole check start - if the user does not have OWNER roleType then add it -->
- <entity-one entity-name="PartyRole" value-field="roleFound">
- <field-map field-name="partyId" from-field="createPartyRoleCtx.partyId"/>
- <field-map field-name="roleTypeId" from-field="createPartyRoleCtx.roleTypeId"/>
- </entity-one>
- <if-empty field="roleFound">
- <call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/>
- </if-empty>
- <!-- PartyRole check end -->
-
+ <call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/>
<if>
<condition>
<and>
Modified: ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=1714408&r1=1714407&r2=1714408&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original)
+++ ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Sun Nov 15 06:47:53 2015
@@ -40,17 +40,7 @@
<check-errors/>
<set field="createPartyRoleCtx.partyId" from-field="userLogin.partyId"/>
<set field="createPartyRoleCtx.roleTypeId" value="OWNER"/>
-
- <!-- PartyRole check start - if the user does not have OWNER roleType then add it -->
- <entity-one entity-name="PartyRole" value-field="roleFound">
- <field-map field-name="partyId" from-field="createPartyRoleCtx.partyId"/>
- <field-map field-name="roleTypeId" from-field="createPartyRoleCtx.roleTypeId"/>
- </entity-one>
- <if-empty field="roleFound">
- <call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/>
- </if-empty>
- <!-- PartyRole check end -->
-
+ <call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/>
<if>
<condition>
<and>