Changeset 7106 for main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates

Timestamp:

13 Nov 2011, 20:13:07 (13 years ago)

Author:

Henrik Bettermann

Message:

Second trial:

Check file name extension of original filename and compare with expected extension taken from the download_name attribute of the respective file upload viewlet. The download_name attribute is also handed over as attr parameter in chooseName and in getFileByContext.

chooseName separates attr into the base filename and the extension.

download_name = u'nice_image.abc'
File storage path: students/A/A123456/nice_image_A123456.abc

StudentFileNameChooser? itself does not require any special file extension. The extension is given by the upload and display viewlets.

(Tests will follow)

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates

Files:

• filedisplay.pt (modified) (1 diff)
• fileupload.pt (modified) (1 diff)
• imagedisplay.pt (modified) (1 diff)
• imageupload.pt (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/filedisplay.pt

@@ -7 +7 @@
   <td class="field">
     <span class="widget">
-      <a tal:attributes="href viewlet/img_src"
-         tal:content="viewlet/img_src"
+      <a tal:attributes="href viewlet/download_name"
+         tal:content="viewlet/download_name"
          target="image">
         LINK

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/fileupload.pt

@@ -7 +7 @@
   <td class="field">
     <span class="widget">
-      <a tal:attributes="href viewlet/img_src"
-         tal:content="viewlet/img_src"
+      <a tal:attributes="href viewlet/download_name"
+         tal:content="viewlet/download_name"
          target="image">
         LINK

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/imagedisplay.pt

@@ -7 +7 @@
   <td class="field">
     <span class="widget">
-      <img tal:attributes="src viewlet/img_src" /><br />
+      <img tal:attributes="src viewlet/download_name" /><br />
     </span>
   </td>

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/imageupload.pt

@@ -7 +7 @@
   <td class="field">
     <span class="widget">
-      <img tal:attributes="src viewlet/img_src" /><br />
+      <img tal:attributes="src viewlet/download_name" /><br />
       <input type="file" tal:attributes="name viewlet/input_name"/>
       <br />