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/21 22:21:43 UTC
svn commit: r1051657 - in /ofbiz/trunk/applications/product:
config/ProductUiLabels.xml
script/org/ofbiz/product/inventory/InventoryServices.xml
script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml
Author: mrisaliti
Date: Tue Dec 21 21:21:41 2010
New Revision: 1051657
URL: http://svn.apache.org/viewvc?rev=1051657&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/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1051657&r1=1051656&r2=1051657&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Tue Dec 21 21:21:41 2010
@@ -8968,6 +8968,10 @@
<value xml:lang="zh">æ产å</value>
<value xml:lang="zh_TW">æç¢å</value>
</property>
+ <property key="ProductCannotAssociatedToContent">
+ <value xml:lang="en">Cannot add this Content: you are not associated with it as an Owner</value>
+ <value xml:lang="it">Non è possibile aggiungere questo contenuto: questo non è associato con un proprietario</value>
+ </property>
<property key="ProductCannotReviewUnKnownProduct">
<value xml:lang="cs">Nemůžete hodnotit neznámý produkt</value>
<value xml:lang="de">Sie können ein unbekanntes Produkt nicht beurteilen</value>
@@ -15059,6 +15063,10 @@
<value xml:lang="zh">对äºè¿ä¸ªäº§åæå¤ä¸ªè®¢åæç»</value>
<value xml:lang="zh_TW">å°äºéåç¢åæå¤åè¨å®æç´°</value>
</property>
+ <property key="ProductMustBeAssociatedWithSupplier">
+ <value xml:lang="en">Cannot update this Product: you are not associated with it as the Supplier</value>
+ <value xml:lang="it">Non è possibile aggiornare questo prodotto: questo non è associato con un fornitore</value>
+ </property>
<property key="ProductName">
<value xml:lang="de">Name</value>
<value xml:lang="en">Name</value>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=1051657&r1=1051656&r2=1051657&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Tue Dec 21 21:21:41 2010
@@ -47,14 +47,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 or FACILITY_${checkAction} or FACILITY_ADMIN permission."/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductCatalogCreatePermissionError"/>
+ </add-error>
</then>
</if>
</simple-method>
<simple-method method-name="facilityGenericPermission" 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 facilityGenericPermission 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/product/CustomerDigitalDownloadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml?rev=1051657&r1=1051656&r2=1051657&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/CustomerDigitalDownloadServices.xml Tue Dec 21 21:21:41 2010
@@ -73,7 +73,9 @@ under the License.
<entity-one entity-name="SupplierProduct" value-field="supplierProduct"/>
<if-empty field="supplierProduct">
- <add-error><fail-message message="Cannot update this Product: you are not associated with it as the Supplier"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductMustBeAssociatedWithSupplier"/>
+ </add-error>
</if-empty>
<check-errors/>
@@ -117,7 +119,9 @@ under the License.
</entity-and>
<if-empty field="supplierProductList">
- <add-error><fail-message message="Cannot update this Product: you are not associated with it as a Supplier"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductMustBeAssociatedWithSupplier"/>
+ </add-error>
</if-empty>
<check-errors/>
@@ -145,7 +149,9 @@ under the License.
<field-map field-name="partyId" from-field="userLogin.partyId"/>
</entity-and>
<if-empty field="supplierProductList">
- <add-error><fail-message message="Cannot update this Product: you are not associated with it as a Supplier"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductMustBeAssociatedWithSupplier"/>
+ </add-error>
</if-empty>
<!-- make sure there is a ContentRole for userLogin.partyId and parameters.contentId and roleTypeId=OWNER -->
@@ -155,7 +161,9 @@ under the License.
<field-map field-name="roleTypeId" value="OWNER"/>
</entity-and>
<if-empty field="contentRoleList">
- <add-error><fail-message message="Cannot add this Content: you are not associated with it as an Owner"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductCannotAssociatedToContent"/>
+ </add-error>
</if-empty>
<check-errors/>
@@ -177,7 +185,9 @@ under the License.
</entity-and>
<if-empty field="supplierProductList">
- <add-error><fail-message message="Cannot update this Product: you are not associated with it as a Supplier"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductMustBeAssociatedWithSupplier"/>
+ </add-error>
</if-empty>
<check-errors/>