Author: pranayp
Date: Sat Feb 21 12:27:38 2015
New Revision: 1661340
URL: http://svn.apache.org/r1661340
Log:
"Applied fix from trunk for revision: 1661334"
------------------------------------------------------------------------
[OFBIZ-6089] - Fixed error in locating service ensureNaPartyRoleTo by removing
it and using ensurePartyRoleTo and ensurePartyRoleFrom services instead.
Thanks Deepak Dixit for reporting the issue and providing the patch.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release14.12/applications/party/servicedef/secas.xml
ofbiz/branches/release14.12/applications/party/servicedef/services.xml
Modified: ofbiz/branches/release14.12/applications/party/servicedef/secas.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/party/servicedef/secas.xml?rev=1661340&r1=1661339&r2=1661340&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/party/servicedef/secas.xml
(original)
+++ ofbiz/branches/release14.12/applications/party/servicedef/secas.xml Sat Feb
21 12:27:38 2015
@@ -40,11 +40,11 @@ under the License.
<!-- before running the createPartyRelationship service, make sure the
party is in the _NA_ role if that is the desired roleTypeId for From or To -->
<eca service="createPartyRelationship" event="invoke">
<condition field-name="roleTypeIdFrom" operator="equals" value="_NA_"/>
- <action service="ensureNaPartyRoleFrom" mode="sync"/>
+ <action service="ensurePartyRoleFrom" mode="sync"/>
</eca>
<eca service="createPartyRelationship" event="invoke">
<condition field-name="roleTypeIdTo" operator="equals" value="_NA_"/>
- <action service="ensureNaPartyRoleTo" mode="sync"/>
+ <action service="ensurePartyRoleTo" mode="sync"/>
</eca>
<!-- party contact mech service ECAs -->
Modified: ofbiz/branches/release14.12/applications/party/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/party/servicedef/services.xml?rev=1661340&r1=1661339&r2=1661340&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/party/servicedef/services.xml
(original)
+++ ofbiz/branches/release14.12/applications/party/servicedef/services.xml Sat
Feb 21 12:27:38 2015
@@ -282,11 +282,6 @@ under the License.
<description>Ensure that the party is in the _NA_ role.</description>
<attribute name="partyId" type="String" mode="IN" optional="false"/>
</service>
- <service name="ensureNaPartyRoleFrom" engine="simple"
-
location="component://party/script/org/ofbiz/party/party/PartySimpleMethods.xml"
invoke="ensureNaPartyRole" auth="true">
- <description>Ensure that the party indicate by partyIdFrom is in the
_NA_ role.</description>
- <attribute name="partyIdFrom" type="String" mode="IN"
optional="false"/>
- </service>
<service name="ensurePartyRoleFrom" engine="simple"
location="component://party/script/org/ofbiz/party/party/PartySimpleMethods.xml"
invoke="ensureNaPartyRole" auth="true">
<description>Ensure that the party indicate by partyIdFrom is in the
roleTypeIdFrom specifc role. If roleTypeIdFrom isn't present use
_NA_</description>
