svn commit: r1606097 - in /ofbiz/trunk/applications/mark
Locked
 
|
Author: jacopoc
Date: Fri Jun 27 13:48:15 2014 New Revision: 1606097 URL: http://svn.apache.org/r1606097 Log: OFBIZ-5012: converted some of the marketing simple services to entity-auto services. Based on a patch contributed by Nicolas Malin, but manually applied and modified in several places because the original patch had some issues. Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml ofbiz/trunk/applications/marketing/servicedef/services.xml Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml?rev=1606097&r1=1606096&r2=1606097&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml Fri Jun 27 13:48:15 2014 @@ -20,98 +20,6 @@ under the License. <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> - <!-- MarketingCampaign methods --> - <simple-method method-name="createMarketingCampaign" short-description="Create an MarketingCampaign"> - <check-permission permission="MARKETING" action="_CREATE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value entity-name="MarketingCampaign" value-field="newEntity"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - - <!-- MarketingCampaign uses a sequenced id, so get the next one now and set it... --> - <sequenced-id sequence-name="MarketingCampaign" field="newEntity.marketingCampaignId"/> - - <create-value value-field="newEntity"/> - - <field-to-result field="newEntity.marketingCampaignId" result-name="marketingCampaignId"/> - </simple-method> - <simple-method method-name="updateMarketingCampaign" short-description="Update an MarketingCampaign"> - <check-permission permission="MARKETING" action="_UPDATE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingUpdatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value entity-name="MarketingCampaign" value-field="lookupPKMap"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="MarketingCampaign" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deleteMarketingCampaign" short-description="Delete an MarketingCampaign"> - <check-permission permission="MARKETING" action="_DELETE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingDeletePermissionError"/> - </check-permission> - <check-errors/> - <!-- FIXME: This does not work due to related entities --> - <make-value entity-name="MarketingCampaign" value-field="lookupPKMap"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="MarketingCampaign" map="lookupPKMap" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- MarketingCampaignPrice methods --> - <simple-method method-name="addPriceRuleToMarketingCampaign" short-description="Add PriceRule To MarketingCampaign"> - <check-permission permission="MARKETING" action="_CREATE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value entity-name="MarketingCampaignPrice" value-field="newEntity"/> - <!-- no non-pk fields in this entity, but there may be later... <set-nonpk-fields map="parameters" value-field="newEntity"/> --> - <set-pk-fields map="parameters" value-field="newEntity"/> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="removePriceRuleFromMarketingCampaign" short-description="Remove PriceRule from MarketingCampaign"> - <check-permission permission="MARKETING" action="_DELETE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingDeletePermissionError"/> - </check-permission> - <check-errors/> - - <make-value entity-name="MarketingCampaignPrice" value-field="lookupPKMap"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="MarketingCampaignPrice" map="lookupPKMap" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - - <!-- MarketingCampaignPromo methods --> - <simple-method method-name="addPromoToMarketingCampaign" short-description="Add Promo To MarketingCampaign"> - <check-permission permission="MARKETING" action="_CREATE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/> - </check-permission> - <check-errors/> - - <make-value entity-name="MarketingCampaignPromo" value-field="newEntity"/> - <!-- no non-pk fields in this entity, but there may be later... <set-nonpk-fields map="parameters" value-field="newEntity"/> --> - <set-pk-fields map="parameters" value-field="newEntity"/> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="removePromoFromMarketingCampaign" short-description="Remove Promo from MarketingCampaign"> - <check-permission permission="MARKETING" action="_DELETE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingDeletePermissionError"/> - </check-permission> - <check-errors/> - - <make-value entity-name="MarketingCampaignPromo" value-field="lookupPKMap"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="MarketingCampaignPromo" map="lookupPKMap" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - <!-- MarketingCampaignRole methods --> <simple-method method-name="createMarketingCampaignRole" short-description="Add Role To MarketingCampaign"> <!-- allow if userLogin.partyId = parameters.partyId or has permission --> @@ -135,14 +43,4 @@ under the License. <check-errors /> </if-empty> </simple-method> - - <simple-method method-name="deleteMarketingCampaignRole" short-description="Remove Role from MarketingCampaign"> - <check-permission permission="MARKETING" action="_DELETE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingDeletePermissionError"/> - </check-permission> - <check-errors/> - <entity-one entity-name="MarketingCampaignRole" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> - </simple-methods> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=1606097&r1=1606096&r2=1606097&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Fri Jun 27 13:48:15 2014 @@ -38,25 +38,6 @@ under the License. <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> </simple-method> - <simple-method method-name="updateContactList" short-description="Update an ContactList"> - <check-permission permission="MARKETING" action="_UPDATE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingUpdatePermissionError"/> - </check-permission> - <check-errors/> - - <entity-one entity-name="ContactList" value-field="lookedUpValue" auto-field-map="true"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="removeContactList" short-description="Delete an ContactList"> - <check-permission permission="MARKETING" action="_DELETE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingDeletePermissionError"/> - </check-permission> - <check-errors/> - - <entity-one entity-name="ContactList" value-field="lookedUpValue" auto-field-map="true"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> <!-- ContactListParty methods --> <simple-method method-name="inlineCheckContactListMechType" short-description="inlineCheckContactListMechType"> @@ -282,15 +263,6 @@ under the License. <store-value value-field="contactlistparty"/> </iterate> </simple-method> - <simple-method method-name="deleteContactListParty" short-description="Remove Party from ContactList"> - <check-permission permission="MARKETING" action="_DELETE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingDeletePermissionError"/> - </check-permission> - <check-errors/> - - <entity-one entity-name="ContactListParty" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> <simple-method method-name="createContactListPartyStatus" short-description="Create ContactListParty Status"> <!-- allow if userLogin.partyId = parameters.partyId or has permission --> <if> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml?rev=1606097&r1=1606096&r2=1606097&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml Fri Jun 27 13:48:15 2014 @@ -20,57 +20,6 @@ under the License. <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd"> - <!-- TrackingCode methods --> - <simple-method method-name="createTrackingCode" short-description="Create an TrackingCode"> - <check-permission permission="MARKETING" action="_CREATE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/> - </check-permission> - <check-errors/> - - <now-timestamp field="nowStamp"/> - - <make-value value-field="newEntity" entity-name="TrackingCode"/> - <set-nonpk-fields map="parameters" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity"/> - - <!-- set the history/audit info --> - <set from-field="userLogin.userLoginId" field="newEntity.createdByUserLogin"/> - <set from-field="nowStamp" field="newEntity.createdDate"/> - <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/> - <set from-field="lastModifiedDate" field="newEntity.createdDate"/> - - <create-value value-field="newEntity"/> - </simple-method> - <simple-method method-name="updateTrackingCode" short-description="Update an TrackingCode"> - <check-permission permission="MARKETING" action="_UPDATE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingUpdatePermissionError"/> - </check-permission> - <check-errors/> - - <now-timestamp field="nowStamp"/> - - <make-value entity-name="TrackingCode" value-field="lookupPKMap"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="TrackingCode" map="lookupPKMap" value-field="lookedUpValue"/> - <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> - - <!-- set the history/audit info --> - <set from-field="userLogin.userLoginId" field="newEntity.lastModifiedByUserLogin"/> - <set from-field="lastModifiedDate" field="newEntity.createdDate"/> - - <store-value value-field="lookedUpValue"/> - </simple-method> - <simple-method method-name="deleteTrackingCode" short-description="Delete an TrackingCode"> - <check-permission permission="MARKETING" action="_DELETE"> - <fail-property resource="MarketingUiLabels.xml" property="MarketingDeletePermissionError"/> - </check-permission> - <check-errors/> - - <make-value entity-name="TrackingCode" value-field="lookupPKMap"/> - <set-pk-fields map="parameters" value-field="lookupPKMap"/> - <find-by-primary-key entity-name="TrackingCode" map="lookupPKMap" value-field="lookedUpValue"/> - <remove-value value-field="lookedUpValue"/> - </simple-method> <!-- TrackingCodeType methods --> <simple-method method-name="createTrackingCodeType" short-description="Create an TrackingCodeType"> <check-permission permission="MARKETING" action="_CREATE"> Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=1606097&r1=1606096&r2=1606097&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/servicedef/services.xml (original) +++ ofbiz/trunk/applications/marketing/servicedef/services.xml Fri Jun 27 13:48:15 2014 @@ -25,48 +25,40 @@ under the License. <version>1.0</version> <!-- MarketingCampaign Services --> - <service name="createMarketingCampaign" default-entity-name="MarketingCampaign" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="createMarketingCampaign" auth="true"> + <service name="createMarketingCampaign" default-entity-name="MarketingCampaign" engine="entity-auto" invoke="create" auth="true"> <description>Create a MarketingCampaign record</description> <permission-service service-name="marketingPermissionService" main-action="CREATE"/> <auto-attributes include="pk" mode="OUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateMarketingCampaign" default-entity-name="MarketingCampaign" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="updateMarketingCampaign" auth="true"> + <service name="updateMarketingCampaign" default-entity-name="MarketingCampaign" engine="entity-auto" invoke="update" auth="true"> <description>Update a MarketingCampaign record</description> <permission-service service-name="marketingPermissionService" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteMarketingCampaign" default-entity-name="MarketingCampaign" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="deleteMarketingCampaign" auth="true"> + <service name="deleteMarketingCampaign" default-entity-name="MarketingCampaign" engine="entity-auto" invoke="delete" auth="true"> <description>Remove a MarketingCampaign record</description> <permission-service service-name="marketingPermissionService" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> - <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <!-- MarketingCampaignPrice Services --> - <service name="addPriceRuleToMarketingCampaign" default-entity-name="MarketingCampaignPrice" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="addPriceRuleToMarketingCampaign" auth="true"> + <service name="addPriceRuleToMarketingCampaign" default-entity-name="MarketingCampaignPrice" engine="entity-auto" invoke="create" auth="true"> <description>Add PriceRule to MarketingCampaign</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <service name="removePriceRuleFromMarketingCampaign" default-entity-name="MarketingCampaignPrice" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="removePriceRuleFromMarketingCampaign" auth="true"> + <service name="removePriceRuleFromMarketingCampaign" default-entity-name="MarketingCampaignPrice" engine="entity-auto" invoke="delete" auth="true"> <description>Remove PriceRule from MarketingCampaign</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- MarketingCampaignPromo Services --> - <service name="addPromoToMarketingCampaign" default-entity-name="MarketingCampaignPromo" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="addPromoToMarketingCampaign" auth="true"> + <service name="addPromoToMarketingCampaign" default-entity-name="MarketingCampaignPromo" engine="entity-auto" invoke="create" auth="true"> <description>Add Promo to MarketingCampaign</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <service name="removePromoFromMarketingCampaign" default-entity-name="MarketingCampaignPromo" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="removePromoFromMarketingCampaign" auth="true"> + <service name="removePromoFromMarketingCampaign" default-entity-name="MarketingCampaignPromo" engine="entity-auto" invoke="delete" auth="true"> <description>Remove Promo from MarketingCampaign</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> @@ -104,8 +96,7 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteMarketingCampaignRole" default-entity-name="MarketingCampaignRole" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="deleteMarketingCampaignRole" auth="true"> + <service name="deleteMarketingCampaignRole" default-entity-name="MarketingCampaignRole" engine="entity-auto" invoke="delete" auth="true"> <description>Remove Role from Campaign</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> @@ -119,17 +110,14 @@ under the License. <override name="contactListTypeId" optional="false"/> <override name="contactListName" optional="false"/> </service> - <service name="updateContactList" default-entity-name="ContactList" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="updateContactList" auth="true"> + <service name="updateContactList" default-entity-name="ContactList" engine="entity-auto" invoke="update" auth="true"> <description>Update a ContactList record</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeContactList" default-entity-name="ContactList" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="removeContactList" auth="true"> + <service name="removeContactList" default-entity-name="ContactList" engine="entity-auto" invoke="delete" auth="true"> <description>Remove a ContactList record</description> <auto-attributes include="pk" mode="IN" optional="false"/> - <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <!-- ContactListParty Services --> @@ -173,8 +161,7 @@ under the License. <attribute name="contactMechId" type="String" mode="IN" optional="false"/> <attribute name="oldContactMechId" type="String" mode="IN" optional="false"/> </service> - <service name="deleteContactListParty" default-entity-name="ContactListParty" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="deleteContactListParty" auth="true"> + <service name="deleteContactListParty" default-entity-name="ContactListParty" engine="entity-auto" invoke="delete" auth="true"> <description>Remove Party from ContactList</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> @@ -264,22 +251,19 @@ under the License. </service> <!-- TrackingCode Services --> - <service name="createTrackingCode" default-entity-name="TrackingCode" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml" invoke="createTrackingCode" auth="true"> + <service name="createTrackingCode" default-entity-name="TrackingCode" engine="entity-auto" invoke="create" auth="true"> <description>Create a TrackingCode record</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <override name="trackingCodeTypeId" optional="false"/> </service> - <service name="updateTrackingCode" default-entity-name="TrackingCode" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml" invoke="updateTrackingCode" auth="true"> + <service name="updateTrackingCode" default-entity-name="TrackingCode" engine="entity-auto" invoke="update" auth="true"> <description>Update a TrackingCode record</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="deleteTrackingCode" default-entity-name="TrackingCode" engine="simple" - location="component://marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml" invoke="deleteTrackingCode" auth="true"> - <description>Update a TrackingCode record</description> + <service name="deleteTrackingCode" default-entity-name="TrackingCode" engine="entity-auto" invoke="delete" auth="true"> + <description>Delete a TrackingCode record</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |