Ticket #890: ticket_comments_in_timeline.1017.diff

htdocs/css/timeline.css

@@ -27 +27 @@
 dt .time { color: #777 }
 dd { font-size: 80%; margin: 0 0 .5em 5em; padding: 0 }
 
+
 /* Apply icon background-image twice to avoid hover-flicker in IE/Win */
 dt.changeset, dt.changeset a { background-image: url(../changeset.png) !important }
 dt.newticket, dt.newticket a { background-image: url(../newticket.png) !important }
 dt.closedticket, dt.closedticket a { background-image: url(../closedticket.png) !important }
 dt.wiki, dt.wiki a { background-image: url(../wiki.png) !important }
 dt.milestone, dt.milestone a { background-image: url(../milestone.png) !important }
+dt.ticketcomment a { font-size: 80%; color: #555 }
+dd.ticketcomment { font-size: 70%; color: #555; margin: 0 0 .5em 5em; padding: 0 }
 
+
 .diff-unmod { color: #000 }
 .diff-rem { color: #e00 }
 .diff-add { color: #2e2 }

templates/timeline.cs

@@ -18 +18 @@
    <?cs if:trac.acl.TICKET_VIEW ?><div class="field">
     <input type="checkbox" id="ticket" name="ticket" <?cs
       if:timeline.ticket ?>checked="checked"<?cs /if ?> />
-    <label for="ticket">Ticket changes</label>
+    <label for="ticket">Ticket status changes</label>
+    <input type="checkbox" id="ticket_comments" name="ticket_comments" <?cs
+      if:timeline.ticket_comments ?>checked="checked"<?cs /if ?> />
+    <label for="ticket_comments">Ticket contributions</label>
    </div><?cs /if ?>
    <?cs if:trac.acl.CHANGESET_VIEW ?><div class="field">
     <input type="checkbox" id="changeset" name="changeset" <?cs
@@ -55 +58 @@
   <a href="<?cs var:url ?>"><span class="time"><?cs
     var:item.time ?> :</span> <?cs var:msg ?></a>
  </dt>
- <?cs if:descr ?><dd><?cs var:descr ?></dd><?cs /if ?>
+ <?cs if:descr ?><dd class="<?cs var:type ?>"><?cs var:descr ?></dd><?cs /if ?>
 <?cs /def ?>
 
 <?cs each:item = timeline.items ?>
@@ -84 +87 @@
  <?cs elif:item.type == #6 ?><!-- milestone -->
   <?cs call:tlitem(item.href, 'milestone',
     '<em>Milestone '+$item.message+'</em> reached', '') ?>
+ <?cs elif:item.type == #7 ?><!-- Ticket comment -->
+  <?cs call:tlitem(item.href, 'ticketcomment',
+    'Ticket <em>#'+$item.idata+'</em> contribution by '+$item.author, $item.message) ?>
  <?cs /if ?>
 <?cs /each ?>
 <?cs if:len(timeline.items) ?></dl><?cs /if ?>

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:
@@ -163 +171 @@
             elif item['type'] == MILESTONE:
                 item['href'] = self.env.href.milestone(item['message'])
                 item['message'] = util.escape(item['message'])
-            else:               # TICKET
+            else:               # all the TICKET types
                 item['href'] = 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 number...
+                # 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(
@@ -182 +197 @@
             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)
@@ -214 +235 @@
 
         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):
@@ -223 +245 @@
             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:
             self.req.hdf.setValue('timeline.milestone', 'checked')
 
-        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')