Changeset 12460

Timestamp:

13 Jan 2015, 08:18:16 (10 years ago)

Author:

Henrik Bettermann

Message:

Adjust to base package.

Location:

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers

Files:

• fileviewlets.py (modified) (6 diffs)
• tests/test_browser.py (modified) (1 diff)

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/fileviewlets.py

@@ -49 +49 @@
     tab_redirect = '#tab2'
 
+    @property
+    def download_filename(self):
+        return u"%s.jpg" % self.context.document_id[:9]
+
 
 class JPGScanEditUpload(JPGScanManageUpload):
@@ -68 +72 @@
     download_name = u'scan.jpg'
 
+    @property
+    def download_filename(self):
+        return u"%s.jpg" % self.context.document_id[:9]
+
 
 class JPGScanImage(Image):
@@ -76 +84 @@
     grok.require('waeup.viewCustomer')
     download_name = u'scan.jpg'
+
+    @property
+    def download_filename(self):
+        return u"%s.jpg" % self.context.document_id[:9]
 
 class JPGScanPDFSlip(JPGScanDisplay):
@@ -92 +104 @@
     download_name = u'scan.pdf'
     tab_redirect = '#tab2'
+
+    @property
+    def download_filename(self):
+        return u"%s.pdf" % self.context.document_id[:9]
 
 
@@ -112 +128 @@
     download_name = u'scan.pdf'
 
+    @property
+    def download_filename(self):
+        return u"%s.pdf" % self.context.document_id[:9]
+
 
 class PDFScanImage(Image):
@@ -121 +141 @@
     download_name = u'scan.pdf'
 
+    @property
+    def download_filename(self):
+        return u"%s" % self.context.document_id[:9]
+
 class PDFScanSlip(PDFScanDisplay):
     grok.view(PDFDocumentSlipPage)

main/ikobacustom.pcn/trunk/src/ikobacustom/pcn/customers/tests/test_browser.py

@@ -307 +307 @@
             name='upload_pdfscanmanageupload').click()
         self.assertTrue(
-            'href="http://localhost/app/customers/K1000000/documents/%s/scan.pdf">PDF File</a>'
-            % docid in self.browser.contents)
+            'href="http://localhost/app/customers/K1000000/documents/%s/scan.pdf">%s.pdf</a>'
+            % (docid, docid[:9]) in self.browser.contents)
         # Browsing the link shows a real pdf
         self.browser.open('scan.pdf')
         self.assertEqual(
             self.browser.headers['content-type'], 'application/pdf')
+        # The name of the downloaded file will be different
+        self.assertEqual(
+            self.browser.headers['Content-Disposition'],
+            'attachment; filename="%s.pdf' % docid[:9])
 
 class ContractUITests(CustomersFullSetup):