Changeset 2553

Timestamp:

08/08/07 03:04:48 (1 year ago)

Author:

coling

Message:

WorkLogPlugin:

Refs #1898 and improves CSV export

Files:

• worklogplugin/0.10/worklog/templates/worklog.cs (modified) (1 diff)
• worklogplugin/0.10/worklog/webui.py (modified) (2 diffs)

worklogplugin/0.10/worklog/templates/worklog.cs

@@ -33 +33 @@
-</div>
-</form>
+
+<div id="altlinks">  <h3>Download in other formats:</h3><ul><li class="first last"><a href="?format=csv" class="csv">CSV</a></li></ul></div>
+
-<?cs include "footer.cs"?>

worklogplugin/0.10/worklog/webui.py

@@ -94 +94 @@
-    def worklog_csv(self, req):
-        # Headers
-
-
+
+
+
+
+
+
+
+
-
-        # Rows
-        db = self.env.get_db_cnx()
-        cursor = db.cursor()
-wl.comment, t.summary
+t.summary, wl.comment
-                       'FROM work_log wl '
-                       'LEFT JOIN ticket t ON wl.ticket=t.id '
-                       'LEFT JOIN session_attribute s ON wl.user=s.sid AND s.name=\'name\' '
-                       'ORDER BY wl.lastchange DESC, wl.user')
-        for (user,name,starttime,endtime,ticket,comment,summary) in cursor:
-            if not comment:
-                comment = ''
-            
-            req.write(user + ',')
-            req.write(name + ',')
-            req.write(str(starttime) + ',')
-            req.write(str(endtime) + ',')
-            req.write(str(ticket) + ',')
-            req.write(summary + ',')
-            req.write(comment)
-            req.write(CRLF)
-
+        for row in cursor:
+            req.write(sep.join([str(item)
+                                .replace(sep, '_').replace('\\', '\\\\')
+                                .replace('\n', '\\n').replace('\r', '\\r')
+                                for item in row]) + CRLF)
-
-                
@@ -136 +135 @@
-
-        if req.args.has_key('format') and req.args['format'] == 'csv':
-plain
+csv
-            self.worklog_csv(req)
-            return None