Changeset 12446

Timestamp:

12 Jan 2015, 09:18:36 (10 years ago)

Author:

Henrik Bettermann

Message:

Remove redundant code and set download_filename only for pdf files.

Location:

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

Files:

• browser/fileviewlets.py (modified) (4 diffs)
• customers/fileviewlets.py (modified) (6 diffs)
• documents/fileviewlets.py (modified) (3 diffs)

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

@@ -106 +106 @@
     grok.viewletmanager(FileManager)
     template = default_filedisplay_template
-    grok.order(1)
     label = _(u'File')
     title = _(u'Scan')
-    download_name = None
-
-    @property
-    def download_filename(self):
-        return u"%s.pdf" % self.context.document_id[:9]
 
     @property
@@ -135 +129 @@
     upload_button =_('Upload selected file')
     delete_button = _('Delete')
-
-    @property
-    def download_filename(self):
-        return u"%s.pdf" % self.context.document_id[:9]
 
     @property
@@ -183 +173 @@
     """
     grok.baseclass()
-    download_name = None
-
-    @property
-    def download_filename(self):
-        return u"%s.pdf" % self.context.document_id[:9]
 
     def render(self):
@@ -205 +190 @@
         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')
-        if self.download_filename:
             self.response.setHeader('Content-Disposition',
-                'attachment; filename="%s' % self.download_filename)
+                'attachment; filename="%s.pdf' % self.download_filename)
         return image

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

@@ -92 +92 @@
     mus = 1024 * 200
     download_name = u'sample'
+    download_filename = download_name
     tab_redirect = '#tab2'
 
@@ -115 +116 @@
     title = _(u'Sample Scan')
     download_name = u'sample'
+    download_filename = download_name
 
 
@@ -120 +122 @@
     """Scan document.
     """
+
     grok.name('sample')
     grok.context(CustomerSampleDocument)
     grok.require('waeup.viewCustomer')
     download_name = u'sample'
+    download_filename = download_name
 
 
@@ -141 +145 @@
     download_name = u'sample.pdf'
     tab_redirect = '#tab2'
+
+    @property
+    def download_filename(self):
+        return u"%s.pdf" % self.context.document_id[:9]
 
 
@@ -161 +169 @@
     download_name = u'sample.pdf'
 
+    @property
+    def download_filename(self):
+        return u"%s.pdf" % self.context.document_id[:9]
+
 
 class PDFScanImage(Image):
@@ -170 +182 @@
     download_name = u'sample.pdf'
 
+    @property
+    def download_filename(self):
+        return u"%s" % self.context.document_id[:9]
+
 
 class PDFScanSlip(PDFScanDisplay):

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

@@ -43 +43 @@
     tab_redirect = '#tab2'
 
+    @property
+    def download_filename(self):
+        return u"%s.pdf" % self.context.document_id[:9]
+
 
 class PDFScanDisplay(FileDisplay):
@@ -55 +59 @@
     download_name = u'file.pdf'
 
+    @property
+    def download_filename(self):
+        return u"%s.pdf" % self.context.document_id[:9]
+
 
 class PDFScanImage(UtilityView, Image):
@@ -64 +72 @@
     download_name = u'file.pdf'
 
+    @property
+    def download_filename(self):
+        return u"%s" % self.context.document_id[:9]
+
     def update(self):
         if self.context.state != PUBLISHED: