Changeset 17877 for main

Timestamp:

10 Aug 2024, 07:01:52 (6 weeks ago)

Author:

Henrik Bettermann

Message:

Add an id to download filenames if necessary. Enable this feature for Final Year Clearance Routing Slip.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/browser/fileviewlets.py (modified) (1 diff)
• src/waeup/kofa/students/fileviewlets.py (modified) (3 diffs)
• src/waeup/kofa/students/tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.8.2.dev0 (unreleased)
 =======================
+
+* Add an id to download filenames if necessary. Enable this feature for
+  Final Year Clearance Routing Slip.
 
 * Implement Final Year Clearance Routing Slip upload (not active in base package).

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

@@ -179 +179 @@
 
     @property
+    def add_id(self):
+        return
+
+    @property
     def download_filename(self):
+        if self.add_id:
+            return self.download_name + '_%s' % self.add_id
         return self.download_name
 

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

@@ -164 +164 @@
     grok.require('waeup.viewStudent')
     label = _(u'Scanned Final Clearance Routing Slip ')
-    download_name = u'routingslip'
-
+    download_name = u'routingslip.pdf'
 
 class FinalClearanceUploadManage(StudentFileUpload):
@@ -174 +173 @@
     grok.view(StudentBaseManageFormPage)
     grok.require('waeup.manageStudent')
-    label = _(u'Scanned Final Clearance Routing Slip (pdf preferred)')
-    download_name = u'routingslip'
+    label = _(u'Scanned Final Clearance Routing Slip (pdf only)')
+    download_name = u'routingslip.pdf'
 
 class FinalClearanceUploadEdit(FinalClearanceUploadManage):
@@ -223 +222 @@
     """Renders pdf slip.
     """
-    grok.name('routingslip')
+    grok.name('routingslip.pdf')
     download_name = u'routingslip'
+
+    @property
+    def add_id(self):
+        return self.context.student_id
 
 class ApplicationSlipImage(StudentImage):

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -719 +719 @@
         self.browser.getControl(
             name='upload_finalclearanceuploadmanage').click()
-        self.assertTrue(
-            'href="http://localhost/app/students/K1000000/routingslip"'
+        print self.browser.contents
+        self.assertTrue(
+            'href="http://localhost/app/students/K1000000/routingslip.pdf"'
             in self.browser.contents)
         return