mirror of
https://git.freebsd.org/ports.git
synced 2025-05-21 11:33:15 -04:00
7cecebef41
- Add NO_ARCH - Switch to options helpers - Regenerate patches with `make makepatch` Approved by: portmgr blanket
49 lines
2 KiB
Python
49 lines
2 KiB
Python
--- tracgantt/gantt.py.orig 2006-07-20 17:07:06 UTC
|
|
+++ tracgantt/gantt.py
|
|
@@ -115,7 +115,7 @@ class GanttComponent(Component):
|
|
show_opened = self.env.config.getbool('gantt-charts',
|
|
'show_opened', 'false')
|
|
|
|
- tickets,dates,broken = self._tickets_for_report(db, report['query'])
|
|
+ tickets,dates,broken = self._tickets_for_report(db, report['query'], req.perm.username)
|
|
tickets,dates = self._paginate_tickets(tickets, dates)
|
|
|
|
req.hdf['gantt.tickets'] = tickets
|
|
@@ -163,7 +163,7 @@ class GanttComponent(Component):
|
|
|
|
return {'id':id, 'title':title, 'query':query, 'description':description}
|
|
|
|
- def _tickets_for_report(self, db, query):
|
|
+ def _tickets_for_report(self, db, query, username):
|
|
""" Get a list of Ticket instances for the tickets in a report """
|
|
|
|
tickets = []
|
|
@@ -172,7 +172,7 @@ class GanttComponent(Component):
|
|
|
|
## Get tickets for this report
|
|
cursor = db.cursor()
|
|
- cursor.execute(query)
|
|
+ cursor.execute(query.replace('$USER', "'%s'" % username))
|
|
info = cursor.fetchall() or []
|
|
cols = [s[0] for s in cursor.description or []]
|
|
db.rollback()
|
|
@@ -344,7 +344,7 @@ class GanttComponent(Component):
|
|
"use_creation_date", "true")
|
|
|
|
if use_cdate:
|
|
- start = datetime.date.fromtimestamp(ticket.time_created)
|
|
+ start = datetime.date.fromordinal(ticket.time_created.toordinal())
|
|
else:
|
|
raise ValueError, "Couldn't get start date"
|
|
|
|
@@ -370,8 +370,8 @@ class GanttComponent(Component):
|
|
% (str(ticket.id), str(start), str(due))
|
|
|
|
# Finally the ticket itself's open and close dates
|
|
- open = datetime.date.fromtimestamp(ticket.time_created)
|
|
- changed = datetime.date.fromtimestamp(ticket.time_changed)
|
|
+ open = ticket.time_created.date()
|
|
+ changed = ticket.time_changed.date()
|
|
|
|
return (start, due, open, changed)
|
|
|