OFBiz › OFBiz - Commits

svn commit: r1052045 - in /ofbiz/trunk/framework/common: config/CommonUiLabels.xml script/org/ofbiz/common/CommonServices.xml script/org/ofbiz/common/email/EmailServices.xml script/org/ofbiz/common/period/PeriodServices.xml

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
mrisaliti
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1052045 - in /ofbiz/trunk/framework/common: config/CommonUiLabels.xml script/org/ofbiz/common/CommonServices.xml script/org/ofbiz/common/email/EmailServices.xml script/org/ofbiz/common/period/PeriodServices.xml

mrisaliti
Author: mrisaliti
Date: Wed Dec 22 19:39:45 2010
New Revision: 1052045

URL: http://svn.apache.org/viewvc?rev=1052045&view=rev
Log:
Replace some fail-message to fail-property tag all common components (OFBIZ-1874)

Modified:
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
    ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml
    ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1052045&r1=1052044&r2=1052045&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Wed Dec 22 19:39:45 2010
@@ -2291,6 +2291,14 @@
         <value xml:lang="zh_CN">电子邮件密码</value>
         <value xml:lang="zh_TW">電子郵件密碼</value>
     </property>
+    <property key="CommonEmailShouldBeSpecified">
+        <value xml:lang="en">PartyId or Email Address (sendTo) should be specified!</value>
+        <value xml:lang="it">Id soggetto o indirizzo e-mail (inviare a) deve essere specificato!</value>
+    </property>
+    <property key="CommonEmailNotValid">
+        <value xml:lang="en">PartyId: ${parameters.partyIdTo} has no valid email address!</value>
+        <value xml:lang="it">Id soggetto: ${parameters.partyIdTo} non ha un'indirizzo e-mail valido!</value>
+    </property>
     <property key="CommonEmailTo">
         <value xml:lang="ar">بريد الإلكتروني إلى</value>
         <value xml:lang="cs">Email komu</value>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=1052045&r1=1052044&r2=1052045&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml Wed Dec 22 19:39:45 2010
@@ -26,7 +26,9 @@ under the License.
     </simple-method>
 
     <simple-method method-name="createKeywordThesaurus" short-description="Create a KeywordThesaurus">
-        <check-permission permission="CATALOG" action="_CREATE"><fail-message message="Security Error: to run createKeywordThesaurus you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/></check-permission>
+        <check-permission permission="CATALOG" action="_CREATE">
+            <fail-property resource="CommonUiLabels" property="CommonGenericPermissionError"/>
+        </check-permission>
         <check-errors/>
         <make-value value-field="newEntity" entity-name="KeywordThesaurus"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
@@ -36,7 +38,9 @@ under the License.
         <create-value value-field="newEntity"/>
     </simple-method>
     <simple-method method-name="updateKeywordThesaurus" short-description="Update a KeywordThesaurus">
-        <check-permission permission="CATALOG" action="_UPDATE"><fail-message message="Security Error: to run updateKeywordThesaurus you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/></check-permission>
+        <check-permission permission="CATALOG" action="_UPDATE">
+            <fail-property resource="CommonUiLabels" property="CommonGenericPermissionError"/>
+        </check-permission>
         <check-errors/>
         <make-value value-field="newEntity" entity-name="KeywordThesaurus"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>
@@ -44,7 +48,9 @@ under the License.
         <store-value value-field="newEntity"/>
     </simple-method>
     <simple-method method-name="deleteKeywordThesaurus" short-description="Delete a KeywordThesaurus">
-        <check-permission permission="CATALOG" action="_DELETE"><fail-message message="Security Error: to run deleteKeywordThesaurus you must have the CATALOG_DELETE or CATALOG_ADMIN permission"/></check-permission>
+        <check-permission permission="CATALOG" action="_DELETE">
+            <fail-property resource="CommonUiLabels" property="CommonGenericPermissionError"/>
+        </check-permission>
         <check-errors/>
         <make-value value-field="newEntity" entity-name="KeywordThesaurus"/>
         <set-pk-fields map="parameters" value-field="newEntity"/>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml?rev=1052045&r1=1052044&r2=1052045&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml Wed Dec 22 19:39:45 2010
@@ -25,7 +25,9 @@ under the License.
         <if-empty field="parameters.sendTo">
             <if-empty field="parameters.partyIdTo">
                 <log level="error" message="PartyId or SendTo should be specified!"></log>
-                <add-error><fail-message message="PartyId or Email Address (sendTo) should be specified!"/></add-error>
+                <add-error>
+                    <fail-property resource="CommonUiLabels" property="CommonEmailShouldBeSpecified"/>
+                </add-error>
             <check-errors/>
             </if-empty>
         </if-empty>
@@ -37,7 +39,9 @@ under the License.
                 </call-service>
                 <if-empty field="parameters.sendTo">
                     <log level="error" message="PartyId: ${parameters.partyIdTo} has no valid email address!"></log>
-                    <add-error><fail-message message="PartyId: ${parameters.partyIdTo} has no valid email address!"/></add-error>
+                    <add-error>
+                        <fail-property resource="CommonUiLabels" property="CommonEmailNotValid"/>
+                    </add-error>
                     <check-errors/>
                 </if-empty>
             </if-empty>

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml?rev=1052045&r1=1052044&r2=1052045&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml Wed Dec 22 19:39:45 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,7 +22,9 @@ under the License.
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
     <!-- CustomTimePeriod Services -->
     <simple-method method-name="createCustomTimePeriod" short-description="Create a CustomTimePeriod">
-        <check-permission permission="PERIOD_MAINT"><fail-message message="Security Error: to run createCustomTimePeriod you must have the PERIOD_MAINT permission"/></check-permission>
+        <check-permission permission="PERIOD_MAINT">
+            <fail-property resource="CommonUiLabels" property="CommonGenericPermissionError"/>
+        </check-permission>
         <check-errors/>
 
         <make-value value-field="newEntity" entity-name="CustomTimePeriod"/>
@@ -35,7 +37,9 @@ under the License.
         <create-value value-field="newEntity"/>
     </simple-method>
     <simple-method method-name="updateCustomTimePeriod" short-description="Update a CustomTimePeriod">
-        <check-permission permission="PERIOD_MAINT"><fail-message message="Security Error: to run updateCustomTimePeriod you must have the PERIOD_MAINT permission"/></check-permission>
+        <check-permission permission="PERIOD_MAINT">
+            <fail-property resource="CommonUiLabels" property="CommonGenericPermissionError"/>
+        </check-permission>
         <check-errors/>
 
         <make-value value-field="lookupPKMap" entity-name="CustomTimePeriod"/>
@@ -45,7 +49,9 @@ under the License.
         <store-value value-field="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteCustomTimePeriod" short-description="Delete a CustomTimePeriod">
-        <check-permission permission="PERIOD_MAINT"><fail-message message="Security Error: to run deleteCustomTimePeriod you must have the PERIOD_MAINT permission"/></check-permission>
+        <check-permission permission="PERIOD_MAINT">
+            <fail-property resource="CommonUiLabels" property="CommonGenericPermissionError"/>
+        </check-permission>
         <check-errors/>
 
         <make-value value-field="lookupPKMap" entity-name="CustomTimePeriod"/>


Free forum by Nabble Edit this page