Author: nmalin
Date: Wed Feb 17 20:44:43 2016
New Revision: 1730935
URL: http://svn.apache.org/viewvc?rev=1730935&view=rev
Log:
correct commit r1728261 relate to issue OFBIZ-6873 : add seca to
addPartyToFacilityGroup and addPartyToFacility, if a roleTypeId is present call
ensurePartyRole. Correct the entity name present on crud PartyToFacilityGroup
service. Thanks Jacques for spotted this.
Modified:
ofbiz/trunk/applications/product/servicedef/secas.xml
ofbiz/trunk/applications/product/servicedef/services_facility.xml
Modified: ofbiz/trunk/applications/product/servicedef/secas.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/secas.xml?rev=1730935&r1=1730934&r2=1730935&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/secas.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/secas.xml Wed Feb 17 20:44:43
2016
@@ -96,10 +96,18 @@ under the License.
<condition field-name="roleTypeId" operator="equals" value="_NA_"/>
<action service="ensureNaPartyRole" mode="sync"/>
</eca>
+ <eca service="addPartyToFacility" event="invoke">
+ <condition field-name="roleTypeId" operator="not-equals" value="_NA_"/>
+ <action service="ensurePartyRole" mode="sync"/>
+ </eca>
<eca service="addPartyToFacilityGroup" event="invoke">
<condition field-name="roleTypeId" operator="equals" value="_NA_"/>
<action service="ensureNaPartyRole" mode="sync"/>
</eca>
+ <eca service="addPartyToFacilityGroup" event="invoke">
+ <condition field-name="roleTypeId" operator="not-equals" value="_NA_"/>
+ <action service="ensurePartyRole" mode="sync"/>
+ </eca>
<eca service="addProdCatalogToParty" event="invoke">
<condition field-name="roleTypeId" operator="equals" value="_NA_"/>
<action service="ensureNaPartyRole" mode="sync"/>
Modified: ofbiz/trunk/applications/product/servicedef/services_facility.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services_facility.xml?rev=1730935&r1=1730934&r2=1730935&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services_facility.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services_facility.xml Wed Feb
17 20:44:43 2016
@@ -762,12 +762,12 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
- <service name="addPartyToFacilityGroup"
default-entity-name="FacilityParty" engine="entity-auto" invoke="create"
auth="true">
+ <service name="addPartyToFacilityGroup"
default-entity-name="FacilityGroupRole" engine="entity-auto" invoke="create"
auth="true">
<description>Add Party To FacilityGroup</description>
<permission-service service-name="facilityGenericPermission"
main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
- <service name="removePartyFromFacilityGroup"
default-entity-name="FacilityParty" engine="entity-auto" invoke="delete"
auth="true">
+ <service name="removePartyFromFacilityGroup"
default-entity-name="FacilityGroupRole" engine="entity-auto" invoke="delete"
auth="true">
<description>Remove Party From FacilityGroup</description>
<permission-service service-name="facilityGenericPermission"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
