Changeset 1182 for trunk/grails-app

Timestamp:

Nov 22, 2010, 5:27:23 PM (13 years ago)

Author:

robert@…

Message:

Improved file upload fields so users can delete existing files and are able to access uploaded files (using a tag in the tag library). See ticket #17

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/FileController.groovy (modified) (4 diffs)
• domain/dbnp/studycapturing/TemplateEntity.groovy (modified) (3 diffs)
• taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (3 diffs)
• views/study/show.gsp (modified) (7 diffs)

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

@@ -23 +23 @@
      */
     def get = {
-        // Check whether the file exists
-        def filename = params.id;
         def fileExists;
+
+                // Filename is not url decoded for some reason
+                def coder = new org.apache.commons.codec.net.URLCodec()
+                def filename = coder.decode(params.id)
+
+                // Security check to prevent accessing files in other directories
+                if( filename.contains( '..' ) ) {
+                        response.status = 500;
+                        render "Invalid filename given";
+                        return;
+                }
+                
         try {
             fileExists = fileService.fileExists( filename )
@@ -33 +43 @@
         if( !filename || !fileExists ) {
             response.status = 404;
-            render( "" );
+            render( "File not found" );
             return;
         }
@@ -42 +52 @@
 
         // Return the file
+                response.setHeader "Content-disposition", "attachment; filename=${filename}"
         response.outputStream << file.newInputStream()
+                response.outputStream.flush()
     }
 
@@ -73 +85 @@
         }
     }
+
+
 }

trunk/grails-app/domain/dbnp/studycapturing/TemplateEntity.groovy

@@ -450 +450 @@
                         return getStore(field.type)[fieldName]
                 }
-
         }
 
@@ -549 +548 @@
                 // Magic setter for files: handle values for file fields
                 //
-                // If NULL is given, the field value is emptied and the old file is removed
+                // If NULL is given or "*deleted*", the field value is emptied and the old file is removed
                 // If an empty string is given, the field value is kept as was
                 // If a file is given, it is moved to the right directory. Old files are deleted. If
@@ -559 +558 @@
                         def currentFile = getFieldValue(field.name);
 
-                        if (value == null) {
+                        if (value == null || ( value.class == String && value == '*deleted*' ) ) {
                                 // If NULL is given, the field value is emptied and the old file is removed
                                 value = "";

trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy

@@ -793 +793 @@
                 out << '<input type="hidden" name="' + attrs.name + '" id="' + attrs.name + '" value="' + attrs.value + '">';
                 out << '<div id="' + attrs.name + 'Example" class="upload_info"></div>';
+                out << '<a id="' + attrs.name + 'Delete" class="upload_del" href="#" onClick="if( confirm( \'Are you sure to delete this file?\' ) ) { deleteFile( \'' + attrs.name + '\' ); } return false;"><img src="' + resource( dir: 'images/icons', file: 'delete.png', plugin: 'famfamfam' ) + '"></a>';
                 out << '<script type="text/javascript">';
                 out << '  $(document).ready( function() { ';
@@ -798 +799 @@
                 out << '    fileUploadField( "' + attrs.name + '" );';
                 out << '    if( filename != "" ) {';
+                out << '      $("#' + attrs.name + 'Delete").show();';
                 out << '      $("#' + attrs.name + 'Example").html("Current file: " + createFileHTML( filename ) )';
                 out << '    }';
@@ -1432 +1434 @@
         }
 
+        def showTemplateField = { attrs, body ->
+                def field = attrs.get( 'field' );
+                def entity = attrs.get( 'entity' );
+                def fieldName = '';
+                def fieldType = '';
+                
+                if( entity ) {
+                        if( field instanceof String ) {
+                                fieldName = field;
+                                fieldType = '';
+                        } else if( field instanceof TemplateField ) {
+                                fieldName = field.name
+                                fieldType = field.type.toString();
+                        } else {
+                                return;
+                        }
+
+                        def value = entity.getFieldValue( fieldName );
+
+                        if( fieldType == 'FILE' && value != "" ) {
+                          out << '<a href="' + g.createLink( controller: "file", action: "get",  id: value ) + '">' + value + '</a>';
+                        } else {
+                                out << value;
+                        }
+
+                }
+        }
+
 }

trunk/grails-app/views/study/show.gsp

@@ -242 +242 @@
                     <td>
                                           <g:if test="${studyInstance.fieldExists(field.name)}">
-                                                ${studyInstance.getFieldValue(field.name)}
+                                                <wizard:showTemplateField field="${field}" entity="${studyInstance}" />
                                           </g:if>
                                           <g:else>
@@ -411 +411 @@
                     </g:if>
                     <g:each in="${subject.giveDomainFields()}" var="field">
-                      <td>${subject.getFieldValue(field.name)}</td>
+                      <td><wizard:showTemplateField field="${field}" entity="${subject}" /></td>
                     </g:each>
                   
@@ -417 +417 @@
                       <td>
                         <g:if test="${subject.fieldExists(field.name)}">
-                          ${subject.getFieldValue(field.name)}
+                                <wizard:showTemplateField field="${field}" entity="${subject}" />
                         </g:if>
                         <g:else>
@@ -495 +495 @@
                           <g:if test="${event.getFieldValue(field.name)}">
                             <g:if test="${fieldCounter > 1}">, </g:if>
-                              ${field.name} = ${event.getFieldValue( field.name )}
+                              ${field.name} = <wizard:showTemplateField field="${field}" entity="${event}" />
                             <g:set var="fieldCounter" value="${fieldCounter + 1}" />
                           </g:if>
@@ -583 +583 @@
                               <g:if test="${event.getFieldValue(field.name)}">
                                 <g:if test="${fieldCounter > 1}">, </g:if>
-                                  ${field.name} = ${event.getFieldValue( field.name )}
+                                  ${field.name} = <wizard:showTemplateField field="${field}" entity="${event}" />
                                 <g:set var="fieldCounter" value="${fieldCounter + 1}" />
                               </g:if>
@@ -744 +744 @@
                           <td>${sample.parentEvent?.template?.name} at ${sample.parentEvent?.getStartTimeString()}</td>
                     <g:each in="${sample.giveDomainFields()}" var="field">
-                      <td>${sample.getFieldValue(field.name)}</td>
+                      <td><wizard:showTemplateField field="${field}" entity="${sample}" /></td>
                     </g:each>
 
@@ -750 +750 @@
                       <td>
                         <g:if test="${sample.fieldExists(field.name)}">
-                          ${sample.getFieldValue(field.name)}
+                          <wizard:showTemplateField field="${field}" entity="${sample}" />
                         </g:if>
                         <g:else>