Changeset 2446

Show
Ignore:
Timestamp:
07/10/07 11:03:31 (1 year ago)
Author:
coling
Message:

WorkLogPlugin:

Fix a quotation issue on the timeline and fix the time delta display function.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • worklogplugin/0.10/worklog/timeline_hook.py

    r2424 r2446  
    4646            previous_update = None 
    4747            for user,ticket,time,starttime,kind,humankind,summary in cursor: 
     48                summary = Markup.escape(summary) 
    4849                ticket_href = href.ticket(ticket) 
    4950                if format == 'rss': 
    50                     title = '%s %s working on Ticket #%s: %s' % \ 
    51                             (user, humankind, ticket, summary) 
     51                    title = Markup('%s %s working on Ticket #%s (%s)' % \ 
     52                                   (user, humankind, ticket, summary)) 
    5253                else: 
    5354                    title = Markup('%s %s working on Ticket <em title="%s">#%s</em>' % \ 

  • worklogplugin/0.10/worklog/uihooks_ticket.py

    r2433 r2446  
    4343  li_task.appendChild(a);""" 
    4444 
    45             timedelta = pretty_timedelta(datetime.fromtimestamp(task['starttime']), None, True); 
     45            timedelta = pretty_timedelta(datetime.fromtimestamp(task['starttime']), None); 
    4646            script += """ 
    4747  li_task.appendChild(document.createTextNode(' for """ + timedelta + """'));""" 
    …… 
    5050 
    5151    def get_ticket_js(self, who, since): 
    52         timedelta = pretty_timedelta(datetime.fromtimestamp(since), None, True); 
     52        timedelta = pretty_timedelta(datetime.fromtimestamp(since), None); 
    5353        script = """ 
    5454  li_tctk = document.createElement('li'); 

  • worklogplugin/0.10/worklog/util.py

    r2424 r2446  
    22 
    33# Stolen from Trac trunk :) 
    4 def pretty_timedelta(time1, time2=None, full=False): 
     4def pretty_timedelta(time1, time2=None): 
    55    """Calculate time delta (inaccurately, only for decorative purposes ;-) for 
    66    prettyprinting. If time1 is None, the current time is used.""" 
    …… 
    1818    age_s = int(diff.days * 86400 + diff.seconds) 
    1919    if age_s < 60: 
    20         return '%i second%s' % (age_s, age_s != 1 and 's' or '') 
     20        return 'less than a minute' 
    2121    rv = '' 
    2222    for u, unit, unit_plural in units: 
    23         r = float(age_s) / float(u) 
    24         if r >= 0.9: 
    25             r = int(round(r)) 
     23        r = int(float(age_s) / float(u)) 
     24        if r > 0: 
    2625            tmp_rv = '%d %s' % (r, r == 1 and unit or unit_plural) 
    27             if not full: 
    28                 return tmp_rv 
    2926            if rv: 
    3027                rv += ', ' 
    3128            rv += tmp_rv 
    32             age_s = float(age_s) - (r * float(u))  
     29        age_s = float(age_s) - (r * float(u))  
    3330    return rv 
    3431