[Rt-commit] rt branch, 4.0/click-to-load-fallback, created. rt-4.0.4-77-g75a405b

[Thomas Sibley]

The branch, 4.0/click-to-load-fallback has been created
        at  75a405b58c89a703957da022796671a2201b05c6 (commit)

- Log -----------------------------------------------------------------
commit 75a405b58c89a703957da022796671a2201b05c6
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Nov 29 12:27:24 2011 -0500

    Click to show history: fallback to a full ticket page rather than a fragment

diff --git a/share/html/Ticket/Display.html b/share/html/Ticket/Display.html
index 318e494..64f9530 100755
--- a/share/html/Ticket/Display.html
+++ b/share/html/Ticket/Display.html
@@ -65,7 +65,7 @@
 
 % $m->callback( Ticket => $TicketObj, %ARGS, CallbackName => 'BeforeShowHistory' );
 
-% if (RT->Config->Get( 'DeferTransactionLoading', $session{'CurrentUser'} )) {
+% if (not $ForceShowHistory and RT->Config->Get( 'DeferTransactionLoading', $session{'CurrentUser'} )) {
     <& /Ticket/Elements/ClickToShowHistory,
         Ticket => $TicketObj,
     &>
@@ -91,6 +91,7 @@ $id => undef
 $TicketObj => undef
 $ShowHeaders => 0
 $Collapsed => undef
+$ForceShowHistory => 0
 </%ARGS>
 
 <%INIT>
diff --git a/share/html/Ticket/Elements/ClickToShowHistory b/share/html/Ticket/Elements/ClickToShowHistory
index 792fa06..0dcfd10 100644
--- a/share/html/Ticket/Elements/ClickToShowHistory
+++ b/share/html/Ticket/Elements/ClickToShowHistory
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <div id="deferred_ticket_history">
     <& /Widgets/TitleBoxStart, title => 'History' &>
-        <a href="<% $url %>" onclick="jQuery('#deferred_ticket_history').text('<% loc('Loading...') %>').load('<% $url |n %>'); return false;" ><% loc('Show ticket history') %></a>
+        <a href="<% $display %>" onclick="jQuery('#deferred_ticket_history').text('<% loc('Loading...') %>').load('<% $url |n %>'); return false;" ><% loc('Show ticket history') %></a>
     <& /Widgets/TitleBoxEnd &>
 </div>
 <%ARGS>
@@ -56,4 +56,5 @@ $Ticket
 <%INIT>
 my $id = $Ticket->id;
 my $url = RT->Config->Get('WebPath') ."/Helpers/TicketHistory?id=". $id;
+my $display = RT->Config->Get('WebPath') ."/Ticket/Display.html?id=$id;ForceShowHistory=1";
 </%INIT>

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