Changeset 9176

Timestamp:

13 Sep 2012, 11:14:27 (12 years ago)

Author:

uli

Message:

Finish merge of trunk and async branch. CSV exports will be named
after the exporter used.

File:

• main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/browser/pages.py (modified) (3 diffs)

main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/browser/pages.py

@@ -1421 +1421 @@
            string representing the exporter title used when triggering
            the export job.
-
-        Calling this method also installs a JavaScript page reloader
-        that reloads the page after some time (1.5 secs), if there is
-        a running export that is not completed yet.
-
-        The method caches results.
         """
         if self._running_exports is None:
@@ -1434 +1428 @@
     def _getRunningExports(self):
         result = self.context.get_export_jobs_status(self.user_id)
-        uncompleted = [x for x in result if x[0] != 'completed']
-        #if len(uncompleted):
-        #    page_reloader.need()
-        #else:
-        #    page_not_reloader.need()
         return result
 
@@ -1486 +1475 @@
         result = open(path, 'rb').read()
         acronym = grok.getSite()['configuration'].acronym.replace(' ','')
-        filename = "%s%s.csv" % (
-            acronym, exporter.title.title().replace(' ',''))
-        self.response.setHeader(
-            'Content-Disposition:', 'attachment; filename="%s' % filename)
+        filename = "%s_%s" % (acronym, os.path.basename(path))
         self.response.setHeader(
             'Content-Type', 'text/csv; charset=UTF-8')
+        self.response.setHeader(
+            'Content-Disposition', 'attachment; filename="%s' % filename)
         # remove job and running_exports entry from context
         self.context.delete_export_entry(