Ticket #7339: trac-show_full_names.diff

ticket/default_workflow.py

@@ -27 +27 @@
 from trac.ticket.api import ITicketActionController, TicketSystem
 from trac.util.compat import set
 from trac.util.translation import _
+from trac.web.chrome import Chrome
 
 # -- Utilities for the ConfigurableTicketWorkflow
 
@@ -218 +219 @@
         this_action = self.actions[action]
         status = this_action['newstate']        
         operations = this_action['operations']
+        chrome = Chrome(self.env)
 
         control = [] # default to nothing
         hints = []
@@ -251 +253 @@
                     hints.append(_("The owner will change to %s") % owners[0])
             else:
                 control.append(tag([_("to "), tag.select(
-                    [tag.option(x, selected=(x == selected_owner or None))
+                    [tag.option(chrome.format_author(req, x), value=x, selected=(x == selected_owner or None))
                      for x in owners],
                     id=id, name=id)]))
                 hints.append(_("The owner will change"))
@@ -369 +371 @@
                       self._has_perms_for_action(req, info, ticket.resource)]
         return actions
 
+

ticket/templates/ticket.html

@@ -310 +310 @@
                     <select py:when="'select'" id="field-${field.name}" name="field_${field.name}">
                       <option py:if="field.optional"></option>
                       <option py:for="option in field.options"
+                              value="${option}"
                               selected="${ticket[field.name] == option or None}"
-                              py:content="option"></option>
+                              py:content="format_author(option)"></option>
                       <optgroup py:for="optgroup in field.optgroups"
                                 label="${optgroup.label}">
                         <option py:for="option in optgroup.options"

test.py

@@ -211 +211 @@
     def get_db_cnx(self):
         return self.db
 
-    def get_known_users(self, db):
+    def get_known_users(self, db=None):
         return self.known_users
 
 

web/chrome.py

@@ -277 +277 @@
     show_email_addresses = BoolOption('trac', 'show_email_addresses', 'false',
         """Show email addresses instead of usernames. If false, we obfuscate
         email addresses (''since 0.11'').""")
+    
+    show_full_names = BoolOption('trac', 'show_full_names', 'false',
+        """Show full names instead of usernames.""")
+        
 
     templates = None
 
@@ -319 +323 @@
         import genshi
         self.env.systeminfo.append(('Genshi',
                                     get_pkginfo(genshi).get('version')))
+        # Get the user infor of all known users
+        self.user_map = {}
+        for username, name, email in self.env.get_known_users():
+            self.user_map[username] = (name, email)
 
     # IEnvironmentSetupParticipant methods
 
@@ -750 +758 @@
         all_cc = self.cc_list(value)
         if not (self.show_email_addresses or 'EMAIL_VIEW' in context.perm):
             all_cc = [obfuscate_email_address(cc) for cc in all_cc]
+        else:
+            all_cc = [self.format_author(context, cc) for cc in all_cc]
         return sep.join(all_cc)
     
     def format_author(self, req, author):
         if self.show_email_addresses or not req or 'EMAIL_VIEW' in req.perm:
+            if self.show_full_names and self.user_map.has_key(author) and self.user_map[author][0]:
+                return self.user_map[author][0]
             return author
         else:
             return obfuscate_email_address(author)