Edgewall Software

Ticket #6888: t6888-r6748-b.diff

File t6888-r6748-b.diff, 1.3 KB (added by osimons, 4 years ago)

Doing obfuscation rendering in web_ui.py instead.

  • trac/ticket/web_ui.py

     
    12581258        elif field == 'keywords': 
    12591259            old_list, new_list = old.split(), new.split() 
    12601260            sep = ' ' 
    1261  
    12621261        if (old_list, new_list) != (None, None): 
    12631262            added = [tag.em(render_elt(x)) for x in new_list  
    12641263                     if x not in old_list] 
     
    12681267            remvd = remvd and tag(separated(remvd, sep), " removed") 
    12691268            if added or remvd: 
    12701269                rendered = tag(added, added and remvd and '; ', remvd) 
     1270        if field in ('reporter', 'owner'): 
     1271            if not (Chrome(self.env).show_email_addresses or  
     1272                    'EMAIL_VIEW' in req.perm(resource_new or ticket.resource)): 
     1273                old = obfuscate_email_address(old) 
     1274                new = obfuscate_email_address(new) 
     1275            if old and not new: 
     1276                rendered = tag(old, " deleted") 
     1277            elif new and not old: 
     1278                rendered = tag(new, " added") 
     1279            elif old and new: 
     1280                rendered = tag("changed from ", old, " to ", new) 
    12711281        return rendered 
    12721282 
    12731283    def grouped_changelog_entries(self, ticket, db, when=None):