You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2010/12/19 15:56:39 UTC
svn commit: r1050864 - in /ofbiz/trunk/applications/marketing: config/
script/org/ofbiz/marketing/campaign/ script/org/ofbiz/marketing/contact/
script/org/ofbiz/marketing/segment/ script/org/ofbiz/marketing/tracking/
Author: mrisaliti
Date: Sun Dec 19 14:56:39 2010
New Revision: 1050864
URL: http://svn.apache.org/viewvc?rev=1050864&view=rev
Log:
Replace some fail-message to fail-property tag in marketing component (OFBIZ-1874)
Modified:
ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml
Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=1050864&r1=1050863&r2=1050864&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Sun Dec 19 14:56:39 2010
@@ -493,6 +493,14 @@
<value xml:lang="zh">å
´è¶£éªè¯ç </value>
<value xml:lang="zh_TW">è趣é©è¨¼ç¢¼</value>
</property>
+ <property key="MarketingContactListOptInVerifyCodeIsMandatory">
+ <value xml:lang="en">No Opt-in Verify Code specified, but one is required.</value>
+ <value xml:lang="it">Nessun codice di verifica Opt-in specificato, ma uno è obbligatorio.</value>
+ </property>
+ <property key="MarketingContactListOptInVerifyCodeNotCorrect">
+ <value xml:lang="en">The Opt-in Verify Code specified [${parameters.optInVerifyCode}] was not correct. Please check the code you were sent.</value>
+ <value xml:lang="it">Il codice di verifia Opt-in specificato [${parameters.optInVerifyCode}] non era corretto. Perfavore verificare il codice che ti è stato inviato.</value>
+ </property>
<property key="MarketingContactListOwnerPartyId">
<value xml:lang="de">Ersteller ID</value>
<value xml:lang="en">Owner Party Id</value>
@@ -611,6 +619,10 @@
<value xml:lang="zh">éªè¯çµåé®ä»¶ç«ç¹æ è¯</value>
<value xml:lang="zh_TW">é©è¨¼é»åéµä»¶ç«å°ID</value>
</property>
+ <property key="MarketingContactMechNotRightForContactList">
+ <value xml:lang="en">The preferred contact mechanism [${preferredContactMechType.description}] was not of the right type for the list [${listContactMechType.description}].</value>
+ <value xml:lang="it">Il contatto preferito [${preferredContactMechType.description}] non era la giusta lista [${listContactMechType.description}].</value>
+ </property>
<property key="MarketingConversionRate">
<value xml:lang="de">Konversationsrate</value>
<value xml:lang="en">Conversion Rate</value>
@@ -624,6 +636,10 @@
<value xml:lang="zh">æç®ç</value>
<value xml:lang="zh_TW">æç®ç</value>
</property>
+ <property key="MarketingCreatePermissionError">
+ <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the MARKETING_CREATE or MARKETING_ADMIN permission</value>
+ <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso MARKETING_CREATE o MARKETING_ADMIN</value>
+ </property>
<property key="MarketingDateRange">
<value xml:lang="en">Date Range</value>
<value xml:lang="es">Rango de fechas</value>
@@ -636,6 +652,10 @@
<value xml:lang="zh">æ¥æèå´</value>
<value xml:lang="zh_TW">æ¥æç¯å</value>
</property>
+ <property key="MarketingDeletePermissionError">
+ <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the MARKETING_DELETE or MARKETING_ADMIN permission</value>
+ <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso MARKETING_DELETE o MARKETING_ADMIN</value>
+ </property>
<property key="MarketingEmailStatusReport">
<value xml:lang="de">E-Mail Statusbericht</value>
<value xml:lang="en">Email Status Report</value>
@@ -914,6 +934,10 @@
<value xml:lang="zh">ååºç»ä¼åçåç±»ç»æ è¯</value>
<value xml:lang="zh_TW">ååçµæå¡çåé¡çµID</value>
</property>
+ <property key="MarketingSegmentGroupPermissionError">
+ <value xml:lang="en">Security Error\: to run ${methodShortDescription} you must have the MARKETING${securityAction} or MARKETING_ADMIN permission</value>
+ <value xml:lang="it">Errore di sicurezza\: per eseguire ${methodShortDescription} devi avere il permesso MARKETING${securityAction} o MARKETING_ADMIN</value>
+ </property>
<property key="MarketingSegmentGroupProductStoreId">
<value xml:lang="de">Produktgeschäfts-ID</value>
<value xml:lang="en">Product Store Id</value>
@@ -1498,6 +1522,10 @@
<value xml:lang="zh">Webåºç¨å称</value>
<value xml:lang="zh_TW">Webæç¨å稱</value>
</property>
+ <property key="MarketingUpdatePermissionError">
+ <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the MARKETING_UPDATE or MARKETING_ADMIN permission</value>
+ <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso MARKETING_UPDATE o MARKETING_ADMIN</value>
+ </property>
<property key="MarketingViewPermissionError">
<value xml:lang="en">View Permission Error</value>
<value xml:lang="es">Usted no cuenta con permiso de acceso</value>
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=1050864&r1=1050863&r2=1050864&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 Sun Dec 19 14:56:39 2010
@@ -22,7 +22,9 @@ under the License.
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- MarketingCampaign methods -->
<simple-method method-name="createMarketingCampaign" short-description="Create an MarketingCampaign">
- <check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run createMarketingCampaign you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
+ <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"/>
@@ -36,7 +38,9 @@ under the License.
<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-message message="Security Error: to run updateMarketingCampaign you must have the MARKETING_UPDATE or MARKETING_ADMIN permission"/></check-permission>
+ <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"/>
@@ -47,7 +51,9 @@ under the License.
<store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteMarketingCampaign" short-description="Delete an MarketingCampaign">
- <check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run deleteMarketingCampaign you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
+ <check-permission permission="MARKETING" action="_DELETE">
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingDeletePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="MarketingCampaign" value-field="lookupPKMap"/>
@@ -58,7 +64,9 @@ under the License.
<!-- MarketingCampaignPrice methods -->
<simple-method method-name="addPriceRuleToMarketingCampaign" short-description="Add PriceRule To MarketingCampaign">
- <check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run addPriceRuleToMarketingCampaign you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
+ <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"/>
@@ -68,7 +76,9 @@ under the License.
<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-message message="Security Error: to run removePriceRuleFromMarketingCampaign you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
+ <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"/>
@@ -79,7 +89,9 @@ under the License.
<!-- MarketingCampaignPromo methods -->
<simple-method method-name="addPromoToMarketingCampaign" short-description="Add Promo To MarketingCampaign">
- <check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run addPromoToMarketingCampaign you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
+ <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"/>
@@ -89,7 +101,9 @@ under the License.
<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-message message="Security Error: to run removePromoFromMarketingCampaign you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
+ <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"/>
@@ -100,7 +114,9 @@ under the License.
<!-- MarketingCampaignRole methods -->
<simple-method method-name="addRoleToMarketingCampaign" short-description="Add Role To MarketingCampaign">
- <check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run addRoleToMarketingCampaign you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
+ <check-permission permission="MARKETING" action="_CREATE">
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="MarketingCampaignRole" value-field="newEntity"/>
@@ -110,7 +126,9 @@ under the License.
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="removeRoleFromMarketingCampaign" short-description="Remove Role from MarketingCampaign">
- <check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run removeRoleFromMarketingCampaign you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
+ <check-permission permission="MARKETING" action="_DELETE">
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingDeletePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="MarketingCampaignRole" value-field="lookupPKMap"/>
@@ -127,7 +145,11 @@ under the License.
<not><if-has-permission permission="MARKETING" action="_CREATE"/></not>
</and>
</condition>
- <then><add-error><fail-message message="Security Error: to run createMarketingCampaignRole you must run it for yourself or have the MARKETING_CREATE or MARKETING_ADMIN permissions."/></add-error></then>
+ <then>
+ <add-error>
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/>
+ </add-error>
+ </then>
</if>
<entity-one entity-name="MarketingCampaign" value-field="marketingCampaign"/>
@@ -151,7 +173,11 @@ under the License.
<not><if-has-permission permission="MARKETING" action="_UPDATE"/></not>
</and>
</condition>
- <then><add-error><fail-message message="Security Error: to run updateMarketingCampaignRole you must run it for yourself or have the MARKETING_UPDATE or MARKETING_ADMIN permissions."/></add-error></then>
+ <then>
+ <add-error>
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingUpdatePermissionError"/>
+ </add-error>
+ </then>
</if>
<check-errors/>
@@ -162,7 +188,9 @@ under the License.
<store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteMarketingCampaignRole" short-description="Remove Role from MarketingCampaign">
- <check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run deleteMarketingCampaignRole you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
+ <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"/>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml?rev=1050864&r1=1050863&r2=1050864&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListEvents.xml Sun Dec 19 14:56:39 2010
@@ -21,7 +21,9 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="importContactListParties" short-description="Import an ContactList Parties">
- <check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run importContactListParties you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
+ <check-permission permission="MARKETING" action="_CREATE">
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/>
+ </check-permission>
<check-errors/>
<now-timestamp field="nowTimestamp"/>
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=1050864&r1=1050863&r2=1050864&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 Sun Dec 19 14:56:39 2010
@@ -22,7 +22,9 @@ under the License.
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- ContactList methods -->
<simple-method method-name="createContactList" short-description="Create an ContactList">
- <check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run createContactList you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
+ <check-permission permission="MARKETING" action="_CREATE">
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="ContactList" value-field="newEntity"/>
@@ -37,7 +39,9 @@ under the License.
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateContactList" short-description="Update an ContactList">
- <check-permission permission="MARKETING" action="_UPDATE"><fail-message message="Security Error: to run updateContactList you must have the MARKETING_UPDATE or MARKETING_ADMIN permission"/></check-permission>
+ <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"/>
@@ -45,7 +49,9 @@ under the License.
<store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeContactList" short-description="Delete an ContactList">
- <check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run deleteContactList you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
+ <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"/>
@@ -66,7 +72,9 @@ under the License.
<entity-one entity-name="ContactMechType" value-field="listContactMechType" auto-field-map="false">
<field-map field-name="contactMechTypeId" from-field="contactList.contactMechTypeId"/>
</entity-one>
- <add-error><fail-message message="The preferred contact mechanism [${preferredContactMechType.description}] was not of the right type for the list [${listContactMechType.description}]."/></add-error>
+ <add-error>
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingContactMechNotRightForContactList"/>
+ </add-error>
</if-compare-field>
</if-not-empty>
</simple-method>
@@ -93,7 +101,11 @@ under the License.
<not><if-has-permission permission="MARKETING" action="_CREATE"/></not>
</and>
</condition>
- <then><add-error><fail-message message="Security Error: to run createContactListParty you must run it for yourself or have the MARKETING_CREATE or MARKETING_ADMIN permissions."/></add-error></then>
+ <then>
+ <add-error>
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/>
+ </add-error>
+ </then>
</if>
<entity-one entity-name="ContactList" value-field="contactList"/>
@@ -132,7 +144,11 @@ under the License.
<not><if-has-permission permission="MARKETING" action="_UPDATE"/></not>
</and>
</condition>
- <then><add-error><fail-message message="Security Error: to run updateContactListParty you must run it for yourself or have the MARKETING_UPDATE or MARKETING_ADMIN permissions."/></add-error></then>
+ <then>
+ <add-error>
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingUpdatePermissionError"/>
+ </add-error>
+ </then>
</if>
<check-errors/>
@@ -176,7 +192,9 @@ under the License.
</iterate>
</simple-method>
<simple-method method-name="deleteContactListParty" short-description="Remove Party from ContactList">
- <check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run deleteContactListParty you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
+ <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"/>
@@ -192,7 +210,11 @@ under the License.
<not><if-has-permission permission="MARKETING" action="_UPDATE"/></not>
</and>
</condition>
- <then><add-error><fail-message message="Security Error: to run createContactListPartyStatus you must run it for yourself or have the MARKETING_CREATE or MARKETING_UPDATE or MARKETING_ADMIN permissions."/></add-error></then>
+ <then>
+ <add-error>
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/>
+ </add-error>
+ </then>
</if>
<check-errors/>
@@ -228,10 +250,14 @@ under the License.
<if-not-empty field="lastContactListPartyStatus.optInVerifyCode">
<if-not-empty field="parameters.optInVerifyCode">
<if-compare-field field="lastContactListPartyStatus.optInVerifyCode" to-field="parameters.optInVerifyCode" operator="not-equals">
- <add-error><fail-message message="The Opt-in Verify Code specified [${parameters.optInVerifyCode}] was not correct. Please check the code you were sent."/></add-error>
+ <add-error>
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingContactListOptInVerifyCodeNotCorrect"/>
+ </add-error>
</if-compare-field>
<else>
- <add-error><fail-message message="No Opt-in Verify Code specified, but one is required."/></add-error>
+ <add-error>
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingContactListOptInVerifyCodeIsMandatory"/>
+ </add-error>
</else>
</if-not-empty>
</if-not-empty>
@@ -252,7 +278,11 @@ under the License.
<not><if-has-permission permission="MARKETING" action="_VIEW"/></not>
</and>
</condition>
- <then><add-error><fail-message message="Security Error: to run sendContactListPartyVerifyEmail you must run it for yourself or have the MARKETING_VIEW or MARKETING_ADMIN permissions."/></add-error></then>
+ <then>
+ <add-error>
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingViewPermissionError"/>
+ </add-error>
+ </then>
</if>
<check-errors/>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=1050864&r1=1050863&r2=1050864&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml Sun Dec 19 14:56:39 2010
@@ -58,7 +58,9 @@ under the License.
<!-- SegmentGroupClassification methods -->
<simple-method method-name="createSegmentGroupClassification" short-description="create a SegmentGroupClassification">
- <check-permission permission="MARKETING" action="_CREATE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupClassificationCreatePermissionError"/></check-permission>
+ <check-permission permission="MARKETING" action="_CREATE">
+ <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupClassificationCreatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="SegmentGroupClassification" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
@@ -66,14 +68,18 @@ under the License.
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateSegmentGroupClassification" short-description="update a SegmentGroupClassification">
- <check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupClassificationUpdatePermissionError"/></check-permission>
+ <check-permission permission="MARKETING" action="_UPDATE">
+ <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupClassificationUpdatePermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="SegmentGroupClassification" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteSegmentGroupClassification" short-description="delete a SegmentGroupClassification">
- <check-permission permission="MARKETING" action="_DELETE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupClassificationDeletePermissionError"/></check-permission>
+ <check-permission permission="MARKETING" action="_DELETE">
+ <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupClassificationDeletePermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="SegmentGroupClassification" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
@@ -81,7 +87,9 @@ under the License.
<!-- SegmentGroupGeo methods -->
<simple-method method-name="createSegmentGroupGeo" short-description="create a SegmentGroupGeo">
- <check-permission permission="MARKETING" action="_CREATE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupGeoCreatePermissionError"/></check-permission>
+ <check-permission permission="MARKETING" action="_CREATE">
+ <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupGeoCreatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="SegmentGroupGeo" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
@@ -89,14 +97,18 @@ under the License.
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateSegmentGroupGeo" short-description="update a SegmentGroupGeo">
- <check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupGeoUpdatePermissionError"/></check-permission>
+ <check-permission permission="MARKETING" action="_UPDATE">
+ <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupGeoUpdatePermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="SegmentGroupGeo" value-field="lookedUpValue"/>
<set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteSegmentGroupGeo" short-description="delete a SegmentGroupGeo">
- <check-permission permission="MARKETING" action="_DELETE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupGeoDeletePermissionError"/></check-permission>
+ <check-permission permission="MARKETING" action="_DELETE">
+ <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupGeoDeletePermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="SegmentGroupGeo" value-field="lookedUpValue"/>
<remove-value value-field="lookedUpValue"/>
@@ -104,7 +116,9 @@ under the License.
<!-- SegmentGroupRole methods -->
<simple-method method-name="createSegmentGroupRole" short-description="create a SegmentGroupRole">
- <check-permission permission="MARKETING" action="_CREATE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupRoleCreatePermissionError"/></check-permission>
+ <check-permission permission="MARKETING" action="_CREATE">
+ <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupRoleCreatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="SegmentGroupRole" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
@@ -112,14 +126,18 @@ under the License.
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateSegmentGroupRole" short-description="update a SegmentGroupRole">
- <check-permission permission="MARKETING" action="_UPDATE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupRoleUpdatePermissionError"/></check-permission>
+ <check-permission permission="MARKETING" action="_UPDATE">
+ <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupRoleUpdatePermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="SegmentGroupRole" value-field="lookedUpValue"/>
<set-pk-fields value-field="lookedUpValue" map="parameters"/>
<store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteSegmentGroupRole" short-description="delete a SegmentGroupRole">
- <check-permission permission="MARKETING" action="_DELETE"><fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupRoleDeletePermissionError"/></check-permission>
+ <check-permission permission="MARKETING" action="_DELETE">
+ <fail-property resource="MarketingUiLabels" property="MarketingSegmentGroupRoleDeletePermissionError"/>
+ </check-permission>
<check-errors/>
<entity-one entity-name="SegmentGroupRole" value-field="lookedUpValue"/>
<!-- <field-to-result field="lookedUpValue.partyId" result-name="partyId"/> -->
@@ -135,14 +153,18 @@ under the License.
SegmentGroup -> SegmentGroupClassification -> PartyClassificationGroup -> PartyClassification -> Party
-->
<set field="securityAction" value="_VIEW"/>
- <check-permission permission="MARKETING" action="${securityAction}"><fail-message message="Security Error\: to run ${methodShortDescription} you must have the MARKETING${securityAction} or MARKETING_ADMIN permission"/></check-permission>
+ <check-permission permission="MARKETING" action="${securityAction}">
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingSegmentGroupPermissionError"/>
+ </check-permission>
<check-errors/>
</simple-method>
<simple-method method-name="findSegmentGroupsOfParty" short-description="Find SegmentGroups Of a Party (that a Party is In)">
<!-- Follows same path as findPartiesInSegmentGroup, but in reverse... -->
<set field="securityAction" value="_VIEW"/>
- <check-permission permission="MARKETING" action="${securityAction}"><fail-message message="Security Error\: to run ${methodShortDescription} you must have the MARKETING${securityAction} or MARKETING_ADMIN permission"/></check-permission>
+ <check-permission permission="MARKETING" action="${securityAction}">
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingSegmentGroupPermissionError"/>
+ </check-permission>
<check-errors/>
</simple-method>
@@ -157,7 +179,9 @@ under the License.
Party -> SegmentGroupRole -> SegmentGroup -> SegmentGroupClassification -> PartyClassificationGroup -> PartyClassification -> Party
-->
<set field="securityAction" value="_VIEW"/>
- <check-permission permission="MARKETING" action="${securityAction}"><fail-message message="Security Error\: to run ${methodShortDescription} you must have the MARKETING${securityAction} or MARKETING_ADMIN permission"/></check-permission>
+ <check-permission permission="MARKETING" action="${securityAction}">
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingSegmentGroupPermissionError"/>
+ </check-permission>
<check-errors/>
<now-timestamp field="nowTimestamp"/>
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=1050864&r1=1050863&r2=1050864&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 Sun Dec 19 14:56:39 2010
@@ -22,7 +22,9 @@ under the License.
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- TrackingCode methods -->
<simple-method method-name="createTrackingCode" short-description="Create an TrackingCode">
- <check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run createTrackingCode you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
+ <check-permission permission="MARKETING" action="_CREATE">
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/>
+ </check-permission>
<check-errors/>
<now-timestamp field="nowStamp"/>
@@ -40,7 +42,9 @@ under the License.
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateTrackingCode" short-description="Update an TrackingCode">
- <check-permission permission="MARKETING" action="_UPDATE"><fail-message message="Security Error: to run updateTrackingCode you must have the MARKETING_UPDATE or MARKETING_ADMIN permission"/></check-permission>
+ <check-permission permission="MARKETING" action="_UPDATE">
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingUpdatePermissionError"/>
+ </check-permission>
<check-errors/>
<now-timestamp field="nowStamp"/>
@@ -57,7 +61,9 @@ under the License.
<store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteTrackingCode" short-description="Delete an TrackingCode">
- <check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run deleteTrackingCode you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
+ <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"/>
@@ -67,7 +73,9 @@ under the License.
</simple-method>
<!-- TrackingCodeType methods -->
<simple-method method-name="createTrackingCodeType" short-description="Create an TrackingCodeType">
- <check-permission permission="MARKETING" action="_CREATE"><fail-message message="Security Error: to run createTrackingCodeType you must have the MARKETING_CREATE or MARKETING_ADMIN permission"/></check-permission>
+ <check-permission permission="MARKETING" action="_CREATE">
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingCreatePermissionError"/>
+ </check-permission>
<check-errors/>
<now-timestamp field="nowStamp"/>
@@ -82,7 +90,9 @@ under the License.
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateTrackingCodeType" short-description="Update an TrackingCodeType">
- <check-permission permission="MARKETING" action="_UPDATE"><fail-message message="Security Error: to run updateTrackingCodeType you must have the MARKETING_UPDATE or MARKETING_ADMIN permission"/></check-permission>
+ <check-permission permission="MARKETING" action="_UPDATE">
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingUpdatePermissionError"/>
+ </check-permission>
<check-errors/>
<now-timestamp field="nowStamp"/>
@@ -95,7 +105,9 @@ under the License.
<store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="deleteTrackingCodeType" short-description="Delete an TrackingCodeType">
- <check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run deleteTrackingCodeType you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
+ <check-permission permission="MARKETING" action="_DELETE">
+ <fail-property resource="MarketingUiLabels.xml" property="MarketingDeletePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="TrackingCodeType" value-field="lookupPKMap"/>