Changeset 12447 for main/waeup.kofa/trunk/src/waeup/kofa/students/fileviewlets.py

Timestamp:

12 Jan 2015, 09:24:58 (10 years ago)

Author:

Henrik Bettermann

Message:

Remove redundant code and set download_filename for pdf files.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/fileviewlets.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/fileviewlets.py

@@ -120 +120 @@
     label = _(u'File')
     title = _(u'Scan')
-    download_name = u'filename.jpg'
+
+    @property
+    def download_filename(self):
+        return self.download_name
 
     @property
@@ -241 +244 @@
     """
     grok.baseclass()
-    grok.name('none.jpg')
     grok.context(IStudent)
     grok.require('waeup.viewStudent')
-    download_name = u'none.jpg'
+
+    @property
+    def download_filename(self):
+        return self.download_name
 
     def render(self):
@@ -262 +267 @@
         elif ext == '.png':
             self.response.setHeader('Content-Type', 'image/png')
+        elif ext == '.tif':
+            self.response.setHeader('Content-Type', 'image/tiff')
         elif ext == '.pdf':
             self.response.setHeader('Content-Type', 'application/pdf')
-        elif ext == '.tif':
-            self.response.setHeader('Content-Type', 'image/tiff')
+            self.response.setHeader('Content-Disposition',
+                'attachment; filename="%s.pdf' % self.download_filename)
         return image