Changeset 3130

Timestamp:

01/22/08 22:07:43 (11 months ago)

Author:

ixokai

Message:

Added "ticket_email_header_fields" option which controls which fields are always shown at the top of ticket announcement emails.

Also cleaned up the templates a little bit.

Files:

• announcerplugin/0.11/announcerplugin/formatters/ticket_email.py (modified) (6 diffs)
• announcerplugin/0.11/announcerplugin/subscribers/wiki.py (modified) (2 diffs)
• announcerplugin/0.11/announcerplugin/templates/ticket_email_mimic.html (modified) (1 diff)
• announcerplugin/0.11/announcerplugin/templates/ticket_email_plaintext.txt (modified) (2 diffs)

announcerplugin/0.11/announcerplugin/formatters/ticket_email.py

@@ -1 +1 @@
-from trac.core import Component, implements
-from announcerplugin.api import IAnnouncementFormatter
-
+, ListOption
-from genshi.template import NewTextTemplate, MarkupTemplate
-from genshi import HTML
@@ -33 +33 @@
-    ticket_email_subject = Option('announcer', 'ticket_email_subject', 
-        "Ticket #${ticket.id}: ${ticket['summary']} {% if action %}[${action}]{% end %}")
+    
+    ticket_email_header_fields = ListOption('announcer', 'ticket_email_header_fields', 'owner, reporter, milestone, priority, severity')
-    
-    def get_format_transport(self):
@@ -68 +70 @@
-        
-    def format_subject(self, transport, realm, style, event):
+        action = None
-        if transport == "email":
-            if realm == "ticket":
@@ -73 +76 @@
-                    if 'status' in event.changes:
-                        action = 'Status -> %s' % (event.target['status'])
-
-
+
-                template = NewTextTemplate(self.ticket_email_subject)
-                return template.generate(ticket=event.target, event=event, action=action).render()
@@ -115 +117 @@
-            author = event.author,
-            comment = event.comment,
+            header = self.ticket_email_header_fields,
-            category = event.category,
-            ticket_link = self.env.abs_href('ticket', ticket.id),
@@ -170 +173 @@
-            ticket = ticket,
-            author = event.author,
+            header = self.ticket_email_header_fields,
-            comment = event.comment,
-            category = event.category,

announcerplugin/0.11/announcerplugin/subscribers/wiki.py

@@ -58 +58 @@
-                
-                sess['announcer_wiki_interests'] = ' '.join(
-
+
+
+
-                )
-                
@@ -68 +70 @@
-        return "prefs_announcer_wiki.html", dict(
-            wiki_interests = '\n'.join(
-
+
+
+
-            )
-        )

announcerplugin/0.11/announcerplugin/templates/ticket_email_mimic.html

@@ -118 +118 @@
-      <div class="title" style="font-weight: bold; border-bottom: 1pt inset #dfdfdf; padding-bottom: .5em;">${ticket['summary']}</div>
-      <table class="header" width="100%">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        </tr>
-      </table>

announcerplugin/0.11/announcerplugin/templates/ticket_email_plaintext.txt

@@ -2 +2 @@
-${ticket['status']} ${ticket['type']}
----------------------------------------------------------------------
-
-
-
+
+
+
+
-{% end %}\
-{% otherwise %}\
-
+
-{% end %}\
-
-
-
-
-
+
+
-{% if category == 'created' %}\
----------------------------------------------------------------------
@@ -39 +37 @@
-Attachment:
- * File '${attachment.filename}' added{% if attachment.description %}: ${attachment.description} {% end %}
-
+\
-{% if comment %}\
----------------------------------------------------------------------