svn commit: r1051645 [1/2] - in /ofbiz/trunk/applications/prod
Locked
svn commit: r1051645 [1/2] - in /ofbiz/trunk/applications/prod
 
|
Author: mrisaliti
Date: Tue Dec 21 20:52:34 2010 New Revision: 1051645 URL: http://svn.apache.org/viewvc?rev=1051645&view=rev Log: Replace some fail-message to fail-property tag in product component (OFBIZ-1874) Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/product/supplier/SupplierProductServices.xml ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1051645&r1=1051644&r2=1051645&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Tue Dec 21 20:52:34 2010 @@ -9183,6 +9183,18 @@ <value xml:lang="zh">ç®å½å称 [æ è¯]</value> <value xml:lang="zh_TW">ç®éå稱 [ID]</value> </property> + <property key="ProductCatalogCreatePermissionError"> + <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the CATALOG_CREATE or CATALOG_ADMIN permission, or the limited CATALOG_ROLE_CREATE permission</value> + <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} tu devi avere il permesso CATALOG_CREATE o CATALOG_ADMIN, il permesso limitato CATALOG_ROLE_CREATE</value> + </property> + <property key="ProductCatalogDeletePermissionError"> + <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the CATALOG_DELETE or CATALOG_ADMIN permission</value> + <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} tu devi avere il permesso CATALOG_DELETE o CATALOG_ADMIN</value> + </property> + <property key="ProductCatalogUpdatePermissionError"> + <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the CATALOG_UPDATE or CATALOG_ADMIN permission</value> + <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} tu devi avere il permesso CATALOG_UPDATE o CATALOG_ADMIN</value> + </property> <property key="ProductCatalogViewPermissionError"> <value xml:lang="de">Sie haben keine Berechtigung diese Seite anzuzeigen. ("CATALOG_VIEW" oder "CATALOG_ADMIN" benötigt)</value> <value xml:lang="en">You do not have permission to view this page. ("CATALOG_VIEW" or "CATALOG_ADMIN" needed)</value> @@ -14962,6 +14974,10 @@ <value xml:lang="zh">æå°åè´§ãå订è´æ°éãé货天æ°</value> <value xml:lang="zh_TW">æå°å貨ãåè¨è³¼æ¸éãé貨天æ¸</value> </property> + <property key="ProductMissingMainActionInPermissionService"> + <value xml:lang="en">In the permission-service element for the productGenericPermission service the main-action attribute was missing but is required</value> + <value xml:lang="it">Nell'elemento permission-service del servizio productGenericPermission l'attributo main-action è mancante ma è obbligatorio</value> + </property> <property key="ProductMoreOptions"> <value xml:lang="de">Mehr Optionen im Drop Down verfügbar.</value> <value xml:lang="en">More options available in drop down.</value> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=1051645&r1=1051644&r2=1051645&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Tue Dec 21 20:52:34 2010 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -28,7 +28,7 @@ under the License. <simple-method method-name="createProductCategory" short-description="Create an ProductCategory"> <check-permission permission="CATALOG" action="_CREATE"> <alt-permission permission="CATALOG_ROLE" action="_CREATE"/> - <fail-message message="Security Error: to run createProductCategory you must have the CATALOG_CREATE or CATALOG_ADMIN permission, or the limited CATALOG_ROLE_CREATE permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> </check-permission> <check-errors/> @@ -400,7 +400,7 @@ under the License. <set value="duplicateCategoryEntities" field="callingMethodName"/> <check-permission permission="CATALOG" action="_CREATE"> <alt-permission permission="CATALOG_ROLE" action="_CREATE"/> - <fail-message message="Security Error: to run createProductCategory you must have the CATALOG_CREATE or CATALOG_ADMIN permission, or the limited CATALOG_ROLE_CREATE permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> </check-permission> <check-errors/> @@ -555,7 +555,7 @@ under the License. <set value="duplicateProductCategory" field="callingMethodName"/> <check-permission permission="CATALOG" action="_CREATE"> <alt-permission permission="CATALOG_ROLE" action="_CREATE"/> - <fail-message message="Security Error: to run createProductCategory you must have the CATALOG_CREATE or CATALOG_ADMIN permission, or the limited CATALOG_ROLE_CREATE permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> </check-permission> <check-errors/> @@ -629,7 +629,7 @@ under the License. <simple-method method-name="createProductCategoryAttribute" short-description="Create an attribute for a product category"> <check-permission permission="CATALOG" action="_CREATE"> - <fail-message message="Security Error: to create a product category attribute requires the CATALOG_CREATE or CATALOG_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> </check-permission> <check-errors/> @@ -642,8 +642,8 @@ under the License. <simple-method method-name="updateProductCategoryAttribute" short-description="Update an association between two product categories"> <check-permission permission="CATALOG" action="_UPDATE"> - <fail-message message="Security Error: to update a product category attribute requires the CATALOG_UPDATE or CATALOG_ADMIN permission"/> - </check-permission> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/> @@ -655,8 +655,8 @@ under the License. <simple-method method-name="deleteProductCategoryAttribute" short-description="Delete an association between two product categories"> <check-permission permission="CATALOG" action="_DELETE"> - <fail-message message="Security Error: to delete a product category attribute requires the CATALOG_DELETE or CATALOG_ADMIN permission"/> - </check-permission> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="lookupPKMap" entity-name="ProductCategoryAttribute"/> @@ -747,7 +747,9 @@ under the License. </condition> <then> <log level="verbose" message="Permission check failed, user does not have permission"/> - <add-error><fail-message message="Security Error: to run ${callingMethodName} you must have the CATALOG_${checkAction} or CATALOG_ADMIN permission or have the CATALOG_ROLE_${checkAction} permission and be associated with a category containing this category."/></add-error> + <add-error> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </add-error> <set field="hasPermission" type="Boolean" value="false"/> </then> </if> @@ -755,7 +757,9 @@ under the License. <simple-method method-name="productCategoryGenericPermission" short-description="Main permission logic"> <set field="mainAction" from-field="parameters.mainAction"/> <if-empty field="mainAction"> - <add-error><fail-message message="In the permission-service element for the productGenericPermission service the main-action attribute was missing but is required"/></add-error> + <add-error> + <fail-property resource="ProductUiLabels" property="ProductMissingMainActionInPermissionService"/> + </add-error> <check-errors/> </if-empty> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml?rev=1051645&r1=1051644&r2=1051645&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/config/ConfigServices.xml Tue Dec 21 20:52:34 2010 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -25,7 +25,9 @@ under the License. <set field="callingMethodName" value="createProductConfig"/> <set field="checkAction" value="CREATE"/> <call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductConfig"/> @@ -45,7 +47,9 @@ under the License. <set field="callingMethodName" value="updateProductConfig"/> <set field="checkAction" value="UPDATE"/> <call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductConfig" value-field="lookupPKMap"/> @@ -60,7 +64,9 @@ under the License. <set field="callingMethodName" value="deleteProductConfig"/> <set field="checkAction" value="DELETE"/> <call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductConfig" value-field="lookupPKMap"/> @@ -73,7 +79,7 @@ under the License. <!-- Methods for Config Items --> <simple-method method-name="createProductConfigItem" short-description="Create a Config Item"> <check-permission action="_CREATE" permission="CATALOG"> - <fail-message message="Security Error: to run createProductConfigItem you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> </check-permission> <check-errors/> <make-value entity-name="ProductConfigItem" value-field="newEntity"/> @@ -84,7 +90,7 @@ under the License. </simple-method> <simple-method method-name="updateProductConfigItem" short-description="Update a Config Item"> <check-permission action="_UPDATE" permission="CATALOG"> - <fail-message message="Security Error: to run updateProductConfigItem you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> </check-permission> <check-errors/> <make-value entity-name="ProductConfigItem" value-field="lookupKeyValue"/> @@ -95,7 +101,7 @@ under the License. </simple-method> <simple-method method-name="deleteProductConfigItem" short-description="Delete a Config Item"> <check-permission action="_DELETE" permission="CATALOG"> - <fail-message message="Security Error: to run deleteProductConfigItem you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> </check-permission> <check-errors/> <make-value entity-name="ProductConfigItem" value-field="lookupKeyValue"/> @@ -106,7 +112,7 @@ under the License. <!-- Methods for Config Options --> <simple-method method-name="createProductConfigOption" short-description="Create a Config Option"> <check-permission action="_CREATE" permission="CATALOG"> - <fail-message message="Security Error: to run createProductConfigOption you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> </check-permission> <check-errors/> <make-value entity-name="ProductConfigOption" value-field="newEntity"/> @@ -119,7 +125,7 @@ under the License. </simple-method> <simple-method method-name="updateProductConfigOption" short-description="Update a Config Option"> <check-permission action="_UPDATE" permission="CATALOG"> - <fail-message message="Security Error: to run updateProductConfigOption you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> </check-permission> <check-errors/> <make-value entity-name="ProductConfigOption" value-field="lookupKeyValue"/> @@ -130,7 +136,7 @@ under the License. </simple-method> <simple-method method-name="deleteProductConfigOption" short-description="Delete a Config Option"> <check-permission action="_DELETE" permission="CATALOG"> - <fail-message message="Security Error: to run deleteProductConfigOption you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> </check-permission> <check-errors/> <make-value entity-name="ProductConfigOption" value-field="lookupKeyValue"/> @@ -141,7 +147,7 @@ under the License. <!-- Methods for ProductConfigProduct --> <simple-method method-name="createProductConfigProduct" short-description="Create a ProductConfigProduct"> <check-permission action="_CREATE" permission="CATALOG"> - <fail-message message="Security Error: to run createProductConfigProduct you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> </check-permission> <check-errors/> <make-value entity-name="ProductConfigProduct" value-field="newEntity"/> @@ -151,7 +157,7 @@ under the License. </simple-method> <simple-method method-name="updateProductConfigProduct" short-description="Update a ProductConfigProduct"> <check-permission action="_UPDATE" permission="CATALOG"> - <fail-message message="Security Error: to run updateProductConfigProduct you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> </check-permission> <check-errors/> <make-value entity-name="ProductConfigProduct" value-field="lookupKeyValue"/> @@ -162,7 +168,7 @@ under the License. </simple-method> <simple-method method-name="deleteProductConfigProduct" short-description="Delete a ProductConfigProduct"> <check-permission action="_DELETE" permission="CATALOG"> - <fail-message message="Security Error: to run deleteProductConfigProduct you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> </check-permission> <check-errors/> <make-value entity-name="ProductConfigProduct" value-field="lookupKeyValue"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml?rev=1051645&r1=1051644&r2=1051645&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/feature/ProductFeatureServices.xml Tue Dec 21 20:52:34 2010 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -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="createProductFeatureCategory" short-description="Create Product Feature Category"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureCategory you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductFeatureCategory" value-field="newEntity"/> @@ -33,7 +35,9 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductFeatureCategory" short-description="Update Product Feature Category"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeatureCategory you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> <check-errors/> <entity-one entity-name="ProductFeatureCategory" value-field="productFeatureCategory"/> @@ -42,7 +46,9 @@ under the License. </simple-method> <simple-method method-name="createProductFeature" short-description="Create Product Feature"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeature you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductFeature"/> @@ -58,7 +64,9 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductFeature" short-description="Update Product Feature"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeature you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> <check-errors/> <entity-one entity-name="ProductFeature" value-field="productFeature"/> @@ -134,7 +142,9 @@ under the License. <!-- Methods for ProductFeatureCategoryAppl --> <simple-method method-name="createProductFeatureCategoryAppl" short-description="Create an Product Feature Category Application"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureCategoryAppl you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductFeatureCategoryAppl"/> @@ -148,7 +158,9 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductFeatureCategoryAppl" short-description="Update an Product Feature Category Application"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeatureCategoryAppl you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCategoryAppl"/> @@ -158,7 +170,9 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="removeProductFeatureCategoryAppl" short-description="Remove a Product Feature Category Application"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureCategoryAppl you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCategoryAppl"/> @@ -169,7 +183,9 @@ under the License. <!-- Methods for ProductFeatureCatGrpAppl --> <simple-method method-name="createProductFeatureCatGrpAppl" short-description="Create a ProductFeatureGroup to ProductCategory Application"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureCatGrpAppl you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductFeatureCatGrpAppl"/> @@ -183,7 +199,9 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductFeatureCatGrpAppl" short-description="Update a ProductFeatureGroup to ProductCategory Application"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeatureCatGrpAppl you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCatGrpAppl"/> @@ -193,7 +211,9 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="removeProductFeatureCatGrpAppl" short-description="Remove a ProductFeatureGroup to ProductCategory Application"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureCatGrpAppl you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureCatGrpAppl"/> @@ -204,7 +224,9 @@ under the License. <!-- ProductFeatureGroup Services --> <simple-method method-name="createProductFeatureGroup" short-description="Create Product Feature Group"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureGroup you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductFeatureGroup"/> @@ -216,7 +238,9 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductFeatureGroup" short-description="Update Product Feature Group"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeatureGroup you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> <check-errors/> <entity-one entity-name="ProductFeatureGroup" value-field="productFeatureGroup"/> @@ -224,7 +248,9 @@ under the License. <store-value value-field="productFeatureGroup"/> </simple-method> <simple-method method-name="createProductFeatureGroupAppl" short-description="Create an Product Feature Group Application"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureGroupAppl you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductFeatureGroupAppl"/> @@ -238,7 +264,9 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductFeatureGroupAppl" short-description="Update an Product Feature Group Application"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeatureGroupAppl you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureGroupAppl"/> @@ -248,7 +276,9 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="removeProductFeatureGroupAppl" short-description="Remove a Product Feature Group Application"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureGroupAppl you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureGroupAppl"/> @@ -259,7 +289,9 @@ under the License. <!-- Methods for ProductFeatureIactn --> <simple-method method-name="createProductFeatureIactn" short-description="Create a Product Feature Interaction"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureIactn you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductFeatureIactn"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -267,7 +299,9 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="removeProductFeatureIactn" short-description="Remove a Product Feature Interaction"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureInteraction you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureIactn"/> @@ -277,7 +311,9 @@ under the License. </simple-method> <!-- Methods for ProductFeatureType --> <simple-method method-name="createProductFeatureType" short-description="Create a Product Feature Type"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductFeatureType you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> <check-errors/> <if> @@ -311,7 +347,9 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductFeatureType" short-description="Update an Product Feature Type"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductFeatureType you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureType"/> @@ -321,7 +359,9 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="removeProductFeatureType" short-description="Remove a Product Feature Type"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run removeProductFeatureType you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> <check-errors/> <make-value value-field="lookupKeyValue" entity-name="ProductFeatureType"/> @@ -333,7 +373,7 @@ under the License. <!-- create a new ProductFeatureApplAttr --> <simple-method method-name="createProductFeatureApplAttr" short-description="Create a ProductFeatureApplAttr"> <check-permission permission="CATALOG" action="_CREATE"> - <fail-message message="Security Error: to run createProductFeatureApplAttr you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductFeatureApplAttr"/> @@ -357,7 +397,7 @@ under the License. <!-- update an existing ProductFeatureApplAttr --> <simple-method method-name="updateProductFeatureApplAttr" short-description="Update an existing ProductFeatureApplAttr"> <check-permission permission="CATALOG" action="_UPDATE"> - <fail-message message="Security Error: to run updateProductFeatureApplAttr you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> </check-permission> <check-errors/> <entity-one entity-name="ProductFeatureApplAttr" value-field="productFeatureApplAttr" auto-field-map="true"/> @@ -370,7 +410,7 @@ under the License. <!-- remove an existing ProductFeatureApplAttr --> <simple-method method-name="removeProductFeatureApplAttr" short-description="Remove an existing ProductFeatureApplAttr"> <check-permission permission="CATALOG" action="_DELETE"> - <fail-message message="Security Error: to run removeProductFeatureApplAttr you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> </check-permission> <check-errors/> <entity-one entity-name="ProductFeatureApplAttr" value-field="productFeatureApplAttr" auto-field-map="true"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml?rev=1051645&r1=1051644&r2=1051645&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/StockMoveServices.xml Tue Dec 21 20:52:34 2010 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -28,7 +28,7 @@ under the License. <simple-method method-name="findStockMovesNeeded" short-description="Find all Stock Moves that need to be done"> <!-- TODO: make this method aware of serialized inventory in addition to non-serialized inventory --> <check-permission permission="FACILITY" action="_VIEW"> - <fail-message message="Security Error: to run findStockMovesNeeded you must have the FACILITY_VIEW or FACILITY_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductFacilityViewPermissionError"/> </check-permission> <check-errors/> @@ -196,7 +196,7 @@ under the License. <simple-method method-name="findStockMovesRecommended" short-description="Find all Stock Moves recommended to be done based on ProductFacilityLocation settings"> <!-- TODO: make this method aware of serialized inventory in addition to non-serialized inventory --> <check-permission permission="FACILITY" action="_VIEW"> - <fail-message message="Security Error: to run findStockMovesRecommended you must have the FACILITY_VIEW or FACILITY_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductFacilityViewPermissionError"/> </check-permission> <check-errors/> @@ -350,10 +350,10 @@ under the License. <simple-method method-name="processPhysicalStockMove" short-description="Process a Physical Stock Move from one FacilityLocation to another, in the same Facility"> <check-permission permission="FACILITY" action="_CREATE"> - <fail-message message="Security Error: to run processPhysicalStockMove you must have the FACILITY_CREATE or FACILITY_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductFacilityCreatePermissionError"/> </check-permission> <check-permission permission="FACILITY" action="_UPDATE"> - <fail-message message="Security Error: to run processPhysicalStockMove you must have the FACILITY_UPDATE or FACILITY_ADMIN permission"/> + <fail-property resource="ProductUiLabels" property="ProductFacilityUpdatePermissionError"/> </check-permission> <check-errors/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=1051645&r1=1051644&r2=1051645&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml Tue Dec 21 20:52:34 2010 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -25,7 +25,9 @@ under the License. <set field="callingMethodName" value="createProductPrice"/> <set field="checkAction" value="CREATE"/> <call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <call-simple-method method-name="inlineHandlePriceWithTaxIncuded"/> @@ -52,7 +54,9 @@ under the License. <set field="callingMethodName" value="updateProductPrice"/> <set field="checkAction" value="UPDATE"/> <call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <call-simple-method method-name="inlineHandlePriceWithTaxIncuded"/> @@ -74,7 +78,9 @@ under the License. <set field="callingMethodName" value="deleteProductPrice"/> <set field="checkAction" value="DELETE"/> <call-simple-method method-name="checkProductRelatedPermission" xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPrice" value-field="lookupPKMap"/> @@ -124,7 +130,9 @@ under the License. </if-empty> <if-empty field="parameters.taxPercentage"> - <add-error><fail-message message="Tax Authority was specified but no Tax Percentage passed in, and could not find one in the Tax Authority Rate Product settings, so cannot handle price with tax included."/></add-error> + <add-error> + <fail-message message="Tax Authority was specified but no Tax Percentage passed in, and could not find one in the Tax Authority Rate Product settings, so cannot handle price with tax included."/> + </add-error> <check-errors/> </if-empty> @@ -172,7 +180,7 @@ under the License. <alt-permission permission="CATALOG_ROLE" action="_CREATE"/> <alt-permission permission="CATALOG_ROLE" action="_UPDATE"/> <alt-permission permission="CATALOG_ROLE" action="_DELETE"/> - <fail-message message="Security Error: to run saveProductPriceChange you must have a CATALOG_* or CATALOG_ROLE_* permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> </check-permission> <check-errors/> @@ -221,8 +229,12 @@ under the License. <!-- ProductPriceRule methods --> <simple-method method-name="createProductPriceRule" short-description="Create an ProductPriceRule"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductPriceRule you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductPriceRule"/> @@ -233,8 +245,12 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductPriceRule" short-description="Update an ProductPriceRule"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductPriceRule you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPriceRule" value-field="lookupPKMap"/> @@ -244,8 +260,12 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPriceRule" short-description="Delete an ProductPriceRule"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPriceRule you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPriceRule" value-field="lookupPKMap"/> @@ -256,8 +276,12 @@ under the License. <!-- ProductPriceCond methods --> <simple-method method-name="createProductPriceCond" short-description="Create an ProductPriceCond"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductPriceCond you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <if-not-empty field="parameters.condValueInput"> @@ -272,8 +296,12 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductPriceCond" short-description="Update an ProductPriceCond"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductPriceCond you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <if-not-empty field="parameters.condValueInput"> @@ -286,8 +314,12 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPriceCond" short-description="Delete an ProductPriceCond"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPriceCond you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPriceCond" value-field="lookupPKMap"/> @@ -298,8 +330,12 @@ under the License. <!-- ProductPriceAction methods --> <simple-method method-name="createProductPriceAction" short-description="Create an ProductPriceAction"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductPriceAction you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductPriceAction"/> @@ -311,8 +347,12 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductPriceAction" short-description="Update an ProductPriceAction"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductPriceAction you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPriceAction" value-field="lookupPKMap"/> @@ -322,8 +362,12 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPriceAction" short-description="Delete an ProductPriceAction"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPriceAction you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPriceAction" value-field="lookupPKMap"/> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=1051645&r1=1051644&r2=1051645&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Tue Dec 21 20:52:34 2010 @@ -23,7 +23,7 @@ under the License. <simple-method method-name="createProduct" short-description="Create a Product"> <check-permission permission="CATALOG" action="_CREATE"> <alt-permission permission="CATALOG_ROLE" action="_CREATE"/> - <fail-message message="Security Error: to run createProduct you must have the CATALOG_CREATE or CATALOG_ADMIN permission, or the limited CATALOG_ROLE_CREATE permission"/> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> </check-permission> <check-errors/> @@ -908,14 +908,18 @@ under the License. </not> </condition> <then> - <add-error><fail-message message="Security Error: to run ${callingMethodName} you must have the CATALOG_${checkAction} or CATALOG_ADMIN permission or have the CATALOG_ROLE_${checkAction} permission and be associated with a category containing this product."/></add-error> + <add-error> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </add-error> </then> </if> </simple-method> <simple-method method-name="productGenericPermission" short-description="Main permission logic"> <set field="mainAction" from-field="parameters.mainAction"/> <if-empty field="mainAction"> - <add-error><fail-message message="In the permission-service element for the productGenericPermission service the main-action attribute was missing but is required"/></add-error> + <add-error> + <fail-property resource="ProductUiLabels" property="ProductMissingMainActionInPermissionService"/> + </add-error> <check-errors/> </if-empty> Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml?rev=1051645&r1=1051644&r2=1051645&view=diff ============================================================================== --- ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml (original) +++ ofbiz/trunk/applications/product/script/org/ofbiz/product/promo/PromoServices.xml Tue Dec 21 20:52:34 2010 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -22,8 +22,12 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <!-- ProductPromo methods --> <simple-method method-name="createProductPromo" short-description="Create a ProductPromo"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductPromo you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductPromo"/> @@ -44,8 +48,12 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductPromo" short-description="Update a ProductPromo"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductPromo you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <set from-field="parameters.productPromoId" field="lookupPKMap.productPromoId"/> @@ -63,8 +71,12 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPromo" short-description="Delete a ProductPromo"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductPromo you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <!-- TODO: if a force remove flag is passed, remove related info first, maybe just rules, store assocs, etc --> @@ -76,8 +88,12 @@ under the License. <!-- ProductPromoAction methods --> <simple-method method-name="createProductPromoAction" short-description="Create an ProductPromoAction"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductPromoAction you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductPromoAction"/> @@ -89,8 +105,12 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductPromoAction" short-description="Update an ProductPromoAction"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductPromoAction you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoAction" value-field="lookupPKMap"/> @@ -100,8 +120,12 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPromoAction" short-description="Delete an ProductPromoAction"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoAction you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoAction" value-field="lookupPKMap"/> @@ -112,8 +136,12 @@ under the License. <!-- ProductPromoCategory methods --> <simple-method method-name="createProductPromoCategory" short-description="Create an ProductPromoCategory"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductPromoCategory you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductPromoCategory"/> @@ -123,8 +151,12 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductPromoCategory" short-description="Update an ProductPromoCategory"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductPromoCategory you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoCategory" value-field="lookupPKMap"/> @@ -134,8 +166,12 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPromoCategory" short-description="Delete an ProductPromoCategory"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoCategory you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoCategory" value-field="lookupPKMap"/> @@ -146,8 +182,12 @@ under the License. <!-- ProductPromoCode methods --> <simple-method method-name="createProductPromoCode" short-description="Create an ProductPromoCode"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductPromoCode you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductPromoCode"/> @@ -171,8 +211,12 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductPromoCode" short-description="Update an ProductPromoCode"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductPromoCode you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoCode" value-field="lookupPKMap"/> @@ -187,8 +231,12 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPromoCode" short-description="Delete an ProductPromoCode"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoCode you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoCode" value-field="lookupPKMap"/> @@ -199,8 +247,12 @@ under the License. <!-- ProductPromoCodeEmail methods --> <simple-method method-name="createProductPromoCodeEmail" short-description="Create an ProductPromoCodeEmail"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductPromoCodeEmail you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductPromoCodeEmail"/> @@ -210,8 +262,12 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="deleteProductPromoCodeEmail" short-description="Delete an ProductPromoCodeEmail"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoCodeEmail you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoCodeEmail" value-field="lookupPKMap"/> @@ -222,8 +278,12 @@ under the License. <!-- ProductPromoCodeParty methods --> <simple-method method-name="createProductPromoCodeParty" short-description="Create an ProductPromoCodeParty"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductPromoCodeParty you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductPromoCodeParty"/> @@ -233,8 +293,12 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="deleteProductPromoCodeParty" short-description="Delete an ProductPromoCodeParty"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoCodeParty you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoCodeParty" value-field="lookupPKMap"/> @@ -245,8 +309,12 @@ under the License. <!-- ProductPromoCond methods --> <simple-method method-name="createProductPromoCond" short-description="Create an ProductPromoCond"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductPromoCond you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductPromoCond"/> @@ -261,8 +329,12 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductPromoCond" short-description="Update an ProductPromoCond"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductPromoCond you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoCond" value-field="lookupPKMap"/> @@ -275,8 +347,12 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPromoCond" short-description="Delete an ProductPromoCond"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoCond you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoCond" value-field="lookupPKMap"/> @@ -287,8 +363,12 @@ under the License. <!-- ProductPromoProduct methods --> <simple-method method-name="createProductPromoProduct" short-description="Create an ProductPromoProduct"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductPromoProduct you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductPromoProduct"/> @@ -298,8 +378,12 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductPromoProduct" short-description="Update an ProductPromoProduct"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductPromoProduct you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoProduct" value-field="lookupPKMap"/> @@ -309,8 +393,12 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPromoProduct" short-description="Delete an ProductPromoProduct"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoProduct you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoProduct" value-field="lookupPKMap"/> @@ -321,8 +409,12 @@ under the License. <!-- ProductPromoRule methods --> <simple-method method-name="createProductPromoRule" short-description="Create a ProductPromoRule"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductPromoRule you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductPromoRule"/> @@ -334,8 +426,12 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductPromoRule" short-description="Update a ProductPromoRule"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductPromoRule you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoRule" value-field="lookupPKMap"/> @@ -345,8 +441,12 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductPromoRule" short-description="Delete a ProductPromoRule"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductPromoRule you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductPromoRule" value-field="lookupPKMap"/> @@ -357,8 +457,12 @@ under the License. <!-- ProductPromo to ProductStore methods --> <simple-method method-name="createProductStorePromoAppl" short-description="Create ProductStorePromoAppl"> - <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createProductStorePromoAppl you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_CREATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value value-field="newEntity" entity-name="ProductStorePromoAppl"/> @@ -373,8 +477,12 @@ under the License. <create-value value-field="newEntity"/> </simple-method> <simple-method method-name="updateProductStorePromoAppl" short-description="Update ProductStorePromoAppl"> - <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateProductStorePromoAppl you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_UPDATE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogUpdatePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductStorePromoAppl" value-field="lookupPKMap"/> @@ -384,8 +492,12 @@ under the License. <store-value value-field="lookedUpValue"/> </simple-method> <simple-method method-name="deleteProductStorePromoAppl" short-description="Delete ProductStorePromoAppl"> - <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteProductStorePromoAppl you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission> - <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> + <check-permission permission="CATALOG" action="_DELETE"> + <fail-property resource="ProductUiLabels" property="ProductCatalogDeletePermissionError"/> + </check-permission> + <check-permission permission="CATALOG_PRICE_MAINT"> + <fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/> + </check-permission> <check-errors/> <make-value entity-name="ProductStorePromoAppl" value-field="lookupPKMap"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |