Changeset 1654

Timestamp:

Mar 21, 2011, 10:34:04 AM (9 years ago)

Author:

robert@…

Message:

Fixed a bug in uploading files. The bug appeared in the simple wizard, but probably also in other places

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/FileController.groovy (modified) (1 diff)
• grails-app/views/simpleWizard/simpleWizard/samples.gsp (modified) (1 diff)
• web-app/js/studywizard.js (modified) (1 diff)

trunk/grails-app/controllers/dbnp/studycapturing/FileController.groovy

@@ -80 +80 @@
         // Return data to the user
         if( newfilename ) {
-            render( newfilename );
+            render( text: newfilename, contentType: "text/plain" );
         } else {
             response.status = 500;

trunk/grails-app/views/simpleWizard/simpleWizard/samples.gsp

@@ -40 +40 @@
                                     </td>
                                     <td width="100px">
+                                        ${sampleForm?.importFile}
                                                 <af:fileField name="importfile" value="${sampleForm?.importFile}"/>
                                     </td>

trunk/web-app/js/studywizard.js

@@ -296 +296 @@
                                 $('#' + field_id + 'Delete').hide();
                         } else {
+                                // Sometimes, the response is returned with HTML tags. 
+                                // It is unknown why this happens, but the tags are not needed.
+                                response = response.replace(/<\/?[^>]+>/gi, '');
+
                                 $('#' + field_id).val(response);
                                 $('#' + field_id + 'Example').html('Uploaded ' + createFileHTML(file));