Changeset 3400

Timestamp:

Jun 13, 2006, 7:49:42 PM (19 years ago)

Author:

Alec Thomas

Message:

Ticket and Wiki attachments now show up in the timeline.

Location:

trunk

Files:

• htdocs/attachment.png (added)
• htdocs/css/timeline.css (modified) (1 diff)
• trac/attachment.py (modified) (2 diffs)
• trac/ticket/web_ui.py (modified) (2 diffs)
• trac/wiki/web_ui.py (modified) (2 diffs)

trunk/htdocs/css/timeline.css

@@ -46 +46 @@
 dt.wiki, dt.wiki a { background-image: url(../wiki.png) !important }
 dt.milestone, dt.milestone a { background-image: url(../milestone.png) !important }
+dt.attachment, dt.attachment a { background-image: url(../attachment.png) !important }
 
 /* styles for the 'changeset_long_messages' option */

trunk/trac/attachment.py

@@ -35 +35 @@
 from trac.web.chrome import add_link, add_stylesheet, INavigationContributor
 from trac.wiki import IWikiSyntaxProvider
+from trac.Timeline import ITimelineEventProvider
 
 
@@ -374 +375 @@
         yield ('attachment', self._format_link)
 
+    # Public methods
+
+    def get_attachment_history(self, start, stop, type):
+        """Return an iterable of tuples describing changes to attachments on
+        a particular object type.
+
+        The tuples are in the form (change, type, id, filename, time,
+        description, author). `change` can currently only be `created`."""
+        # Traverse attachment directory
+        db = self.env.get_db_cnx()
+        cursor = db.cursor()
+        cursor.execute("SELECT type, id, filename, time, description, author "
+                       "  FROM attachment "
+                       "  WHERE time > %s AND time < %s "
+                       "        AND type = %s", (start, stop, type))
+        for type, id, filename, time, description, author in cursor:
+            yield ('created', type, id, filename, time, description, author)
+
     # Internal methods
 

trunk/trac/ticket/web_ui.py

@@ -20 +20 @@
 from StringIO import StringIO
 
-from trac.attachment import attachments_to_hdf, Attachment
+from trac.attachment import attachments_to_hdf, Attachment, AttachmentModule
 from trac.config import BoolOption, Option
 from trac.core import *
@@ -418 +418 @@
                     yield produce(row, 'new', {}, None, None)
 
+            # Attachments
+            if 'ticket_details' in filters:
+                for change, type, id, filename, time, description, author in \
+                        AttachmentModule(self.env). \
+                            get_attachment_history(start, stop, 'ticket'):
+                    title = Markup('<em>%s</em> attached to ticket <em>#%s</em> by %s' % 
+                                   (os.path.basename(filename), id, author))
+                    yield ('attachment',
+                           self.env.href('attachment', type, id, filename),
+                           title, time, author, description)
+
     # Internal methods
 

trunk/trac/wiki/web_ui.py

@@ -17 +17 @@
 #         Christopher Lenz <[email protected]>
 
+import os
 import re
 import StringIO
 
-from trac.attachment import attachments_to_hdf, Attachment
+from trac.attachment import attachments_to_hdf, Attachment, AttachmentModule
 from trac.core import *
 from trac.perm import IPermissionRequestor
@@ -163 +164 @@
                 yield 'wiki', href, title, t, author, comment
 
+            # Attachments
+            for change, type, id, filename, time, description, author in \
+                    AttachmentModule(self.env).get_attachment_history(start, stop,
+                                                                      'wiki'): 
+                title = Markup('<em>%s</em> attached to <em>%s</em> by %s' %
+                               (os.path.basename(filename), id, author))
+                yield ('attachment',
+                       self.env.href('attachment', type, id, filename),
+                       title, time, author, description)
+
+
     # Internal methods