| 1 | Index: web_ui.py |
|---|
| 2 | =================================================================== |
|---|
| 3 | --- web_ui.py (revision 7499) |
|---|
| 4 | +++ web_ui.py (working copy) |
|---|
| 5 | @@ -1270,6 +1270,15 @@ |
|---|
| 6 | ticket.values.update(values) |
|---|
| 7 | |
|---|
| 8 | context = Context.from_request(req, ticket.resource) |
|---|
| 9 | + |
|---|
| 10 | + # display the owner and reporter links only |
|---|
| 11 | + # in the case of non-obfuscated emails |
|---|
| 12 | + chrome = Chrome(self.env) |
|---|
| 13 | + for user in 'reporter', 'owner': |
|---|
| 14 | + link = '%s_link' % user |
|---|
| 15 | + if chrome.format_author(req, ticket[user]) == ticket[user]: |
|---|
| 16 | + data[link] = self._query_link(req, user, ticket[user]) |
|---|
| 17 | + |
|---|
| 18 | data.update({ |
|---|
| 19 | 'context': context, |
|---|
| 20 | 'fields': fields, 'changes': changes, |
|---|
| 21 | @@ -1278,8 +1287,6 @@ |
|---|
| 22 | 'action_controls': action_controls, |
|---|
| 23 | 'action': selected_action, |
|---|
| 24 | 'change_preview': change_preview, |
|---|
| 25 | - 'reporter_link': self._query_link(req, 'reporter', ticket['reporter']), |
|---|
| 26 | - 'owner_link': self._query_link(req, 'owner', ticket['owner']) |
|---|
| 27 | }) |
|---|
| 28 | |
|---|
| 29 | def rendered_changelog_entries(self, req, ticket, when=None): |
|---|
| 30 | Index: templates/ticket.html |
|---|
| 31 | =================================================================== |
|---|
| 32 | --- templates/ticket.html (revision 7499) |
|---|
| 33 | +++ templates/ticket.html (working copy) |
|---|
| 34 | @@ -137,9 +137,18 @@ |
|---|
| 35 | not in ('type', 'owner')]"> |
|---|
| 36 | <tr> |
|---|
| 37 | <th id="h_reporter">Reported by:</th> |
|---|
| 38 | - <td headers="h_reporter" class="searchable">${reporter_link}</td> |
|---|
| 39 | + <td headers="h_reporter" class="searchable"> |
|---|
| 40 | + <py:choose test="defined('reporter_link')"> |
|---|
| 41 | + <py:when test="True">${reporter_link}</py:when> |
|---|
| 42 | + <py:otherwise>${authorinfo(ticket.reporter)}</py:otherwise> |
|---|
| 43 | + </py:choose> |
|---|
| 44 | + </td> |
|---|
| 45 | <th id="h_owner">Owned by:</th> |
|---|
| 46 | - <td headers="h_owner">${owner_link} |
|---|
| 47 | + <td headers="h_owner"> |
|---|
| 48 | + <py:choose test="defined('owner_link')"> |
|---|
| 49 | + <py:when test="True">${owner_link}</py:when> |
|---|
| 50 | + <py:otherwise>${ticket.owner and authorinfo(ticket.owner) or ''}</py:otherwise> |
|---|
| 51 | + </py:choose> |
|---|
| 52 | </td> |
|---|
| 53 | </tr> |
|---|
| 54 | <tr py:for="row in group(fields, 2, lambda f: f.type != 'textarea')" |
|---|
