Changeset 9837

Timestamp:

7 Jan 2013, 08:30:59 (12 years ago)

Author:

Henrik Bettermann

Message:

Put job_id into filename and log job_id in order to identify who has created, downloaded and discarded exports.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/pages.py (modified) (1 diff)
• browser/tests/test_browser.py (modified) (4 diffs)
• students/tests/test_browser.py (modified) (2 diffs)

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

@@ -1589 +1589 @@
         acronym = grok.getSite()['configuration'].acronym.replace(' ','')
         filename = "%s_%s" % (acronym, os.path.basename(path))
+        filename = filename.replace('.csv', '_%s.csv' % job_id)
         self.response.setHeader(
             'Content-Type', 'text/csv; charset=UTF-8')

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

@@ -211 +211 @@
                          'text/csv; charset=UTF-8')
         self.assertEqual(self.browser.headers['content-disposition'],
-                         'attachment; filename="WAeUP.Kofa_faculties.csv')
+            'attachment; filename="WAeUP.Kofa_faculties_%s.csv' % job_id)
         self.assertEqual(self.browser.contents,
             'code,title,title_prefix,users_with_local_roles\r\n'
@@ -227 +227 @@
                         'faculties, job_id=' in logcontent)
         self.assertTrue('zope.mgr - browser.pages.ExportCSVView - '
-                        'downloaded: WAeUP.Kofa_faculties.csv, job_id=' in logcontent)
+                        'downloaded: WAeUP.Kofa_faculties_%s.csv, job_id=%s'
+                        % (job_id, job_id) in logcontent)
         return
 
@@ -298 +299 @@
         self.browser.getLink("Download").click()
         self.assertEqual(self.browser.headers['content-type'],
-                         'text/csv; charset=UTF-8')
+          'text/csv; charset=UTF-8')
         self.assertEqual(self.browser.headers['content-disposition'],
-                         'attachment; filename="WAeUP.Kofa_students.csv')
+          'attachment; filename="WAeUP.Kofa_students_%s.csv' % job_id)
         # No students yet
         self.assertEqual(self.browser.contents,
@@ -319 +320 @@
         self.assertTrue(
             'zope.mgr - browser.pages.ExportCSVView '
-            '- downloaded: WAeUP.Kofa_students.csv, job_id=' in logcontent)
+            '- downloaded: WAeUP.Kofa_students_%s.csv, job_id=%s'
+            % (job_id, job_id) in logcontent)
         return
 

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

@@ -2762 +2762 @@
             'text/csv; charset=UTF-8')
         self.assertTrue(
-            'filename="WAeUP.Kofa_students.csv' in
+            'filename="WAeUP.Kofa_students_%s.csv' % job_id in
             self.browser.headers['content-disposition'])
         self.assertEqual(len(self.app['datacenter'].running_exports), 1)
@@ -2780 +2780 @@
         self.assertTrue(
             'zope.mgr - students.browser.ExportJobContainerDownload '
-            '- downloaded: WAeUP.Kofa_students.csv, job_id='
+            '- downloaded: WAeUP.Kofa_students_%s.csv, job_id=%s'
+            % (job_id, job_id)
             )
         self.assertTrue(
             'zope.mgr - students.browser.ExportJobContainerOverview '
-            '- discarded: job_id='
+            '- discarded: job_id=%s' % job_id
             )