Ticket #2669: reusable_export_csv.diff

trac/ticket/query.py

@@ -613 +613 @@
            self.env.is_component_enabled(ReportModule):
             req.hdf['query.report_href'] = req.href.report()
 
-    def export_csv(self, query, sep=','):
+    def export_csv(self, query, sep=',', mimetype='text/plain'):
         content = StringIO()
         cols = query.get_columns()
         content.write(sep.join([col for col in cols]) + CRLF)
@@ -624 +624 @@
                                                         .replace('\n', ' ')
                                                         .replace('\r', ' ')
                                     for col in cols]) + CRLF)
-        return (content.getvalue(), 'text/plain;charset=utf-8')
+        return (content.getvalue(), '%s;charset=utf-8' % mimetype)
 
     def export_rss(self, req, query):
         query.verbose = True

trac/ticket/web_ui.py

@@ -412 +412 @@
 
     # Internal methods
 
-    def export_csv(self, ticket, sep=','):
+    def export_csv(self, ticket, sep=',', mimetype='text/plain'):
         content = StringIO()
         content.write(sep.join(['id'] + [f['name'] for f in ticket.fields])
                       + CRLF)
@@ -421 +421 @@
                                  .replace(sep, '_').replace('\\', '\\\\')
                                  .replace('\n', '\\n').replace('\r', '\\r')
                                  for f in ticket.fields]) + CRLF)
-        return (content.getvalue(), 'text/plain;charset=utf-8')
+        return (content.getvalue(), '%s;charset=utf-8' % mimetype)
         
     def export_rss(self, req, ticket):
         db = self.env.get_db_cnx()