Changeset 12444 for main/waeup.ikoba/trunk/src/waeup/ikoba/browser

Timestamp:

11 Jan 2015, 22:43:35 (10 years ago)

Author:

Henrik Bettermann

Message:

We need to provide unique filenames. Let's use the document id for the filename and not the download_name of the respective viewlet.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/browser

Files:

• fileviewlets.py (modified) (4 diffs)
• templates/filedisplay.pt (modified) (1 diff)
• templates/fileupload.pt (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/browser/fileviewlets.py

@@ -109 +109 @@
     label = _(u'File')
     title = _(u'Scan')
-    download_name = u'filename.jpg'
+    download_name = None
+
+    @property
+    def download_filename(self):
+        return u"%s.pdf" % self.context.document_id[:9]
 
     @property
@@ -131 +135 @@
     upload_button =_('Upload selected file')
     delete_button = _('Delete')
+
+    @property
+    def download_filename(self):
+        return u"%s.pdf" % self.context.document_id[:9]
 
     @property
@@ -175 +183 @@
     """
     grok.baseclass()
-    grok.name('none.jpg')
-    download_name = u'none.jpg'
+    download_name = None
+
+    @property
+    def download_filename(self):
+        return u"%s.pdf" % self.context.document_id[:9]
 
     def render(self):
@@ -198 +209 @@
         elif ext == '.tif':
             self.response.setHeader('Content-Type', 'image/tiff')
+        if self.download_filename:
+            self.response.setHeader('Content-Disposition',
+                'attachment; filename="%s' % self.download_filename)
         return image

main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/filedisplay.pt

@@ -5 +5 @@
   <td>
     <a tal:attributes="href python: view.url(context, viewlet.download_name)"
-       tal:content="viewlet/download_name"
+       tal:content="viewlet/download_filename"
        target="image">
       LINK

main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/fileupload.pt

@@ -7 +7 @@
     <tal:file tal:condition="viewlet/file_exists">
       <a tal:attributes="href python: view.url(context, viewlet.download_name)"
-         tal:content="viewlet/title"
+         tal:content="viewlet/download_filename"
          target="image">
         LINK