[cvs] expresso commit by lhamel: fix from wesleywu

[JCorporate Ltd]

Log Message:
-----------
fix from wesleywu

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ui:
        DefaultAutoElement.java

Revision Data
-------------
Index: DefaultAutoElement.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ui/DefaultAutoElement.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ui/DefaultAutoElement.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ui/DefaultAutoElement.java -u -r1.55 -r1.56
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ui/DefaultAutoElement.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ui/DefaultAutoElement.java
@@ -664,6 +664,7 @@
         DataFieldMetaData metaData = dbobj.getFieldMetaData(fieldName);
         Locale currentLocale = request.getLocale();
 
+        // use fieldname if param name is empty
         if (parameterName == null) {
             parameterName = fieldName;
         }
@@ -679,17 +680,16 @@
         //
         //Check for multipart request handling.
         //
-        if (request.isFileParameter(fieldName)) {
+        if (request.isFileParameter(parameterName)) {
             try {
-                String fileName = request.getFileName(fieldName);
-                String param = request.getParameter(fieldName);
+                String fileName = request.getFileName(parameterName);
                 dbobj.getDataField(fieldName).setAttribute("fileName", fileName);
 
                 String origFileName = null;
                 String mimeType = null;
 
-                if (param != null) {
-                    origFileName = getOriginalFileName(param);
+                if (oneParameter != null) {
+                    origFileName = getOriginalFileName(oneParameter);
                     dbobj.getDataField(fieldName).setAttribute("origFileName",
                             origFileName);
                     mimeType = MimeTypes.getMimeType(fileName,
@@ -707,7 +707,7 @@
                     mediaObject.setField(fieldName + "_fileName", origFileName);
                 }
 
-                return param;
+                return oneParameter;
             } catch (DBException ex) {
                 log.warn("Validation error for field:", ex);
                 ec.addError(ex.getMessage());