Ticket #890: Timeline.py.diff

trac/Timeline.py

@@ -34 +34 @@
     template_name = 'timeline.cs'
     template_rss_name = 'timeline_rss.cs'
 
-    def get_info (self, start, stop, maxrows, tickets,
+    def get_info (self, start, stop, maxrows, tickets, ticket_comments,
                   changeset, wiki, milestone):
         cursor = self.db.cursor ()
 
         tickets = tickets and self.perm.has_permission(perm.TICKET_VIEW)
+        ticket_comments = ticket_comments and self.perm.has_permission(perm.TICKET_VIEW)
         changeset = changeset and self.perm.has_permission(perm.CHANGESET_VIEW)
         wiki = wiki and self.perm.has_permission(perm.WIKI_VIEW)
         milestone = milestone and self.perm.has_permission(perm.MILESTONE_VIEW)
@@ -52 +53 @@
         REOPENED_TICKET = 4
         WIKI = 5
         MILESTONE = 6
+        TICKET_COMMENT = 7
 
         q = []
         if changeset:
@@ -90 +92 @@
                      "name AS message, '' AS author " 
                      "FROM milestone WHERE time>=%s AND time<=%s" %
                      (start, stop))
+        if ticket_comments:
+            q.append("SELECT time, ticket AS idata, '' AS tdata, 7 AS type, "
+                     "newvalue AS message, author AS author "
+                     "FROM ticket_change WHERE field = 'comment' "
+                     "AND time>=%s AND time<=%s" % (start, stop))
 
         q_str = string.join(q, ' UNION ALL ')
         q_str += ' ORDER BY time DESC'
@@ -100 +107 @@
 
         # Make the data more HDF-friendly
         info = []
+        tickets = {}
         while 1:
             row = cursor.fetchone()
             if not row:
@@ -168 +176 @@
             elif item['type'] == MILESTONE:
                 item['href'] = util.escape(self.env.href.milestone(item['message']))
                 item['message'] = util.escape(item['message'])
-            else:               # TICKET
+            else:               # all the TICKET types
                 item['href'] = util.escape(self.env.href.ticket(item['idata']))
+                if item['type'] == TICKET_COMMENT:
+                # The following would be ok if there would be a cost effective way
+                # to get that change nunmber...
+                # item['href'] += '#change_%d' % item['change']
+                    pass
+                else:
+                    tickets[(item['idata'], item['time'])] = 1
                 msg = item['message']
                 item['shortmsg'] = util.escape(util.shorten_line(msg))
                 item['message'] = wiki_to_oneliner(
@@ -187 +202 @@
             item['message.rss'] = util.escape(item['message'] or '')
 
             info.append(item)
-        return info
+        # Ok, the following line is maybe not Python 2.1 friendly, I don't know...
+        # return [ i for i in info if i['type'] != 7 or not tickets.has_key((i['idata'], i['time'])) ]
+        info2 = []
+        for item in info:
+            if item['type'] != 7 or not tickets.has_key((item['idata'], item['time'])):
+                info2.append(item)
+        return info2
 
     def render (self):
         self.perm.assert_permission(perm.TIMELINE_VIEW)
@@ -218 +239 @@
 
         wiki = self.args.has_key('wiki') 
         ticket = self.args.has_key('ticket')
+        ticket_comments = self.args.has_key('ticket_comments')
         changeset = self.args.has_key('changeset')
         milestone = self.args.has_key('milestone')
         if not (wiki or ticket or changeset or milestone):
@@ -227 +249 @@
             self.req.hdf.setValue('timeline.wiki', 'checked')
         if ticket:
             self.req.hdf.setValue('timeline.ticket', 'checked')
+        if ticket_comments:
+            self.req.hdf.setValue('timeline.ticket_comments', 'checked')
         if changeset:
             self.req.hdf.setValue('timeline.changeset', 'checked')
         if milestone:
@@ -247 +271 @@
             '?daysback=90&max=50%s&format=rss' % rssargs,
             'RSS Feed', 'application/rss+xml', 'rss')
 
-        info = self.get_info (start, stop, maxrows, ticket,
+        info = self.get_info (start, stop, maxrows, ticket, ticket_comments,
                               changeset, wiki, milestone)
         util.add_dictlist_to_hdf(info, self.req.hdf, 'timeline.items')
         self.req.hdf.setValue('title', 'Timeline')