svn commit: r491871 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java

Author: jleroux
Date: Tue Jan  2 09:52:50 2007
New Revision: 491871

URL: http://svn.apache.org/viewvc?view=rev&rev=491871
Log:
A fix from Jacopo tested by Guido Amarilla and myself (fr_FR), thanks to both.
This closes "Incorrect Product Supplier update and delete in some locales" (https://issues.apache.org/jira/browse/OFBIZ-430)

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java?view=diff&rev=491871&r1=491870&r2=491871
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java Tue Jan  2 09:52:50 2007
@@ -179,7 +179,7 @@
             
             if (UtilValidate.isNotEmpty(this.type)) {
                 try {
-                    newValue = ObjectType.simpleTypeConvert(newValue, this.type, null, locale);
+                    newValue = ObjectType.simpleTypeConvert(newValue, this.type, null, null);
                 } catch (GeneralException e) {
                     String errMsg = "Could not convert field value for the field: [" + this.field.getOriginalName() + "] to the [" + this.type + "] type for the value [" + newValue + "]: " + e.toString();
                     Debug.logError(e, errMsg, module);
@@ -441,12 +441,12 @@
                     context.put("queryString", queryString);
                     context.put("queryStringMap", result.get("queryStringMap"));
                     if (UtilValidate.isNotEmpty(queryString)){
-                     try {
-                     String queryStringEncoded = queryString.replaceAll("&", "%26");
+                        try {
+                            String queryStringEncoded = queryString.replaceAll("&", "%26");
                             context.put("queryStringEncoded", queryStringEncoded);
-                     } catch (PatternSyntaxException e) {
-                    
-                     }
+                        } catch (PatternSyntaxException e) {
+                            
+                        }
                     }
                 } else {
                     context.putAll(result);