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

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/customers

Files:

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

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

@@ -97 +97 @@
 class SampleScanEditUpload(SampleScanManageUpload):
     """Scan upload viewlet for customer.
+
+    If a user has both permissions, waeup.manageCustomer and
+    waeup.handleCustomer, the upload viewlet appears twice.
     """
     grok.view(DocumentEditFormPage)
@@ -121 +124 @@
     grok.require('waeup.viewCustomer')
     download_name = u'sample'
+
 
 class SampleScanPDFSlip(SampleScanDisplay):
@@ -166 +170 @@
     download_name = u'sample.pdf'
 
+
 class PDFScanSlip(PDFScanDisplay):
     grok.view(PDFDocumentSlipPage)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -1104 +1104 @@
             name='upload_pdfscanmanageupload').click()
         self.assertTrue(
-            'href="http://localhost/app/customers/K1000000/documents/%s/sample.pdf">PDF File</a>'
-            % docid in self.browser.contents)
+            'href="http://localhost/app/customers/K1000000/documents/%s/sample.pdf">%s.pdf</a>'
+            % (docid, docid[:9]) in self.browser.contents)
         # Browsing the link shows a real pdf
         self.browser.open('sample.pdf')