Ticket #843: patch-changesbyuser-r1011.diff
| File patch-changesbyuser-r1011.diff, 2.7 KB (added by pkou@…, 8 years ago) |
|---|
-
trac/Timeline.py
35 35 template_rss_name = 'timeline_rss.cs' 36 36 37 37 def get_info (self, start, stop, maxrows, tickets, 38 changeset, wiki, milestone ):38 changeset, wiki, milestone, foruser=''): 39 39 cursor = self.db.cursor () 40 40 41 41 tickets = tickets and self.perm.has_permission(perm.TICKET_VIEW) … … 46 46 if tickets == changeset == wiki == milestone == 0: 47 47 return [] 48 48 49 filter_by_user = 0 50 if foruser: 51 filter_by_user = 1 52 if foruser == '(empty)': foruser = '' 53 49 54 CHANGESET = 1 50 55 NEW_TICKET = 2 51 56 CLOSED_TICKET = 3 … … 104 109 row = cursor.fetchone() 105 110 if not row: 106 111 break 112 if filter_by_user and row['author'] != foruser: 113 continue 107 114 t = time.localtime(int(row['time'])) 108 115 gmt = time.gmtime(int(row['time'])) 109 116 item = {'time': time.strftime('%X', t), … … 192 199 193 200 _from = self.args.get('from', '') 194 201 _daysback = self.args.get('daysback', '') 202 foruser = self.args.get('user', '') 195 203 196 204 # Parse the from date and adjust the timestamp to the last second of the day 197 205 try: … … 207 215 self.req.hdf.setValue('timeline.from', 208 216 time.strftime('%x', time.localtime(_from))) 209 217 self.req.hdf.setValue('timeline.daysback', str(daysback)) 218 self.req.hdf.setValue('timeline.user', foruser) 210 219 211 220 stop = _from 212 221 start = stop - daysback * 86400 … … 229 238 self.req.hdf.setValue('timeline.milestone', 'checked') 230 239 231 240 info = self.get_info (start, stop, maxrows, ticket, 232 changeset, wiki, milestone )241 changeset, wiki, milestone, foruser) 233 242 util.add_dictlist_to_hdf(info, self.req.hdf, 'timeline.items') 234 243 self.req.hdf.setValue('title', 'Timeline') 235 244 -
templates/timeline.cs
40 40 if:timeline.milestone ?>checked="checked"<?cs /if ?> /> 41 41 <label for="milestone">Milestones</label> 42 42 </div><?cs /if ?> 43 <div> 44 <label for="user">View changes by</label> 45 <input type="text" size="10" id="user" name="user" 46 value="<?cs var:timeline.user ?>" /> (empty for all users) 47 </div> 43 48 </fieldset> 44 49 <div class="buttons"> 45 50 <input type="submit" value="Update" />
