Ticket #7562: autoquery_patch_linked_fields_r7508.diff

trac/ticket/web_ui.py

@@ -125 +125 @@
         but keeps the old behavior for upgraded environments (i.e. 'no').
         (''since 0.11'').""")
     
-    unlinked_fields = ListOption('ticket', 'unlinked_fields', 
-                                 default=['estimatedhours', 'hours', 'totalhours'],
-                                 doc="fields to exclude from AutoQuery markup")
+    linked_fields = ListOption('ticket', 'linked_fields', 
+                               default=['reporter', 'owner', 'priority', 'type', 'status', 'component', 'version'],
+                               doc="fields to link to queries")
 
     # IContentConverter methods
 
@@ -1064 +1064 @@
         for key in field_changes:
             ticket[key] = field_changes[key]['new']
 
-    def _query_link(self, req, name, value):
+    def _query_link(self, req, name, value, text=None):
         """return a link to /query with the appropriate name and value"""
         query = req.href('query', **{name:value})
         args = self.env.config.get('query', 'default_anonymous_query')
         if args:
             query = '%s&%s' % (query, args)
-        return tag.a(value, href=query)
+        return tag.a(text or value, href=query)
 
     def _prepare_fields(self, req, ticket):
         context = Context.from_request(req, ticket.resource)
@@ -1080 +1080 @@
             type_ = field['type']
  
             # enable a link to custom query for the field
-            if name not in self.unlinked_fields:
+            if name in self.linked_fields and type != 'textarea':
                 field['rendered'] = self._query_link(req, name, ticket[name])
 
             # per field settings
@@ -1149 +1149 @@
                 value = ticket.values.get(name)
                 if value in ('1', '0'):
                     field['rendered'] = value == '1' and _('yes') or _('no')
+                    if name in self.linked_fields:
+                        field['rendered'] = self._query_link(req, name, value, field['rendered'])
                   
             # ensure sane defaults
             field.setdefault('optional', False)
@@ -1270 +1272 @@
             ticket.values.update(values)
 
         context = Context.from_request(req, ticket.resource)
+
+        # Display the owner and reporter links when not obfuscated
+        chrome = Chrome(self.env)
+        for user in 'reporter', 'owner':
+            if chrome.format_author(req, ticket[user]) == ticket[user]:
+                data['%s_link' % user] = self._query_link(req, user,
+                                                            ticket[user])
+
         data.update({
             'context': context,
             'fields': fields, 'changes': changes,
@@ -1278 +1288 @@
             'action_controls': action_controls,
             'action': selected_action,
             'change_preview': change_preview,
-            'reporter_link': self._query_link(req, 'reporter', ticket['reporter']),
-            'owner_link': self._query_link(req, 'owner', ticket['owner'])
         })
 
     def rendered_changelog_entries(self, req, ticket, when=None):

trac/ticket/templates/ticket.html

@@ -136 +136 @@
                  py:with="fields = [f for f in fields if not f.skip and f.name
                                     not in ('type', 'owner')]">
             <tr>
-              <th id="h_reporter">Reported by:</th>
-              <td headers="h_reporter" class="searchable">${reporter_link}</td>
+              <th id="h_reporter">Reported by:</th>
+              <td headers="h_reporter" class="searchable">
+                ${defined('reporter_link') and reporter_link or authorinfo(ticket.reporter)}
+              </td>
               <th id="h_owner">Owned by:</th>
-              <td headers="h_owner">${owner_link}
+              <td headers="h_owner">
+                ${defined('owner_link') and owner_link or authorinfo(ticket.owner)}
               </td>
             </tr>
             <tr py:for="row in group(fields, 2, lambda f: f.type != 'textarea')"