[Rt-commit] rt branch, 4.2/link-display, created. rt-4.1.13-283-gda32c52

[Alex Vandiver]

The branch, 4.2/link-display has been created
        at  da32c52a877329038b030b5738a06ed831c87882 (commit)

- Log -----------------------------------------------------------------
commit da32c52a877329038b030b5738a06ed831c87882
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Jul 9 15:31:52 2013 -0400

    Avoid attempting to nest <a> tags with links and ShowUser
    
    ShowUser now links to the user, which interacts poorly with beig inside
    the <a href="<% $href %>"> of the thing we are trying to link to.
    
    Trailing "\" have been added such that Mason keeps the output on one
    line.  This is easier than fixing tests to look for results across one
    or two newlines but not across <span> elements.

diff --git a/share/html/Elements/ShowLink b/share/html/Elements/ShowLink
index 9593230..2bc680f 100644
--- a/share/html/Elements/ShowLink
+++ b/share/html/Elements/ShowLink
@@ -45,20 +45,20 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<a href="<% $href %>">
 % my $member = $URI->Object;
 % if (blessed($member) && $member->isa("RT::Ticket")) {
 % my $inactive = $member->QueueObj->IsInactiveStatus($member->Status);
 
 <span class="<% $inactive ? 'ticket-inactive' : '' %>">
 
-<%$member->Id%>: (<& /Elements/ShowUser, User => $member->OwnerObj &>) <%$member->Subject || ''%> [<% loc($member->Status) %>]
+<a href="<% $href %>"><%$member->Id%>:</a> \
+(<& /Elements/ShowUser, User => $member->OwnerObj &>) \
+<a href="<% $href %>"><%$member->Subject || ''%> [<% loc($member->Status) %>]</a>
 </span>
 
 % } else {
-<%$URI->AsString%>
+<a href="<% $href %>"><%$URI->AsString%></a>
 % }
-</a>
 <%ARGS>
 $URI => undef
 </%ARGS>

-----------------------------------------------------------------------