Edgewall Software

Ticket #4019: TicketQueryMissingFieldsByMgood.diff

File TicketQueryMissingFieldsByMgood.diff, 1.8 KB (added by ilias@…, 5 years ago)

Patch provided by mgood

Line 
1Index: trac/ticket/query.py
2===================================================================
3--- trac/ticket/query.py        (revision 4062)
4+++ trac/ticket/query.py        (working copy)
5@@ -25,7 +25,7 @@
6 from trac.perm import IPermissionRequestor
7 from trac.ticket.api import TicketSystem
8 from trac.ticket.model import Ticket
9-from trac.util.datefmt import to_timestamp, utc
10+from trac.util.datefmt import to_timestamp, utc, format_datetime
11 from trac.util.html import escape, html, unescape
12 from trac.util.text import shorten_line, CRLF
13 from trac.web import IRequestHandler
14@@ -54,7 +54,7 @@
15         self.fields = TicketSystem(self.env).get_ticket_fields()
16         self.cols = [] # lazily initialized
17
18-        if self.order != 'id' \
19+        if self.order not in ('id', 'changetime', 'time') \
20                 and self.order not in [f['name'] for f in
21self.fields]:
22             # order by priority by default
23             self.order = 'priority'
24@@ -370,6 +370,8 @@
25
26         cols = self.get_columns()
27         labels = dict([(f['name'], f['label']) for f in self.fields])
28+        labels['changetime'] = 'Modified'
29+        labels['time'] = 'Created'
30         headers = [{
31             'name': col, 'label': labels.get(col, 'Ticket'),
32             'href': self.get_href(req, order=col, desc=(col ==
33self.order and
34@@ -414,6 +416,8 @@
35                 groups.setdefault(group_key, []).append(ticket)
36                 if not groupsequence or groupsequence[-1] !=
37group_key:
38                     groupsequence.append(group_key)
39+            ticket['time'] = format_datetime(ticket['time'])
40+            ticket['changetime'] =
41format_datetime(ticket['changetime'])
42             description = ticket.get('description')
43             if description:
44                 ticket['description'] = wiki_to_html(description,
45self.env,