[Rt-commit] rtir branch, 4.0.0/displaypath-double-id, created. 4.0.0rc2-1-gc09cf6f

[Shawn Moore]

The branch, 4.0.0/displaypath-double-id has been created
        at  c09cf6fe97fbce49c528aa838c5fe107a5ff51fb (commit)

- Log -----------------------------------------------------------------
commit c09cf6fe97fbce49c528aa838c5fe107a5ff51fb
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri Jul 15 16:24:24 2016 +0000

    Avoid double concatenation if ?id=X on txn anchors
    
        RT's /Elements/ShowTransaction already appends ?id=X#txn-Y to
        the DisplayPath URL.
    
        This better matches how UpdatePath, ForwardPath, EncryptionPath
        are specified.

diff --git a/html/Callbacks/RTIR/Helpers/TicketHistory/ExtraShowHistoryArguments b/html/Callbacks/RTIR/Helpers/TicketHistory/ExtraShowHistoryArguments
index 160f3d2..bf3bf59 100644
--- a/html/Callbacks/RTIR/Helpers/TicketHistory/ExtraShowHistoryArguments
+++ b/html/Callbacks/RTIR/Helpers/TicketHistory/ExtraShowHistoryArguments
@@ -51,11 +51,11 @@ return unless $type;
 
 my $id = $Ticket->Id;
 %$ExtraArgs = (
-        DisplayPath    => RT::IR->HREFTo("Display.html?id=$id"),
-        UpdatePath     =>  RT::IR->HREFTo("Update.html"),
+        DisplayPath    => RT::IR->HREFTo("Display.html"),
+        UpdatePath     => RT::IR->HREFTo("Update.html"),
         ForwardPath    => RT::IR->HREFTo("Forward.html"),
-        EncryptionPath =>  RT::IR->HREFTo("Crypt.html"),
-        (($type eq "Incident") ? () : (WarnUnsigned   => 1)),
+        EncryptionPath => RT::IR->HREFTo("Crypt.html"),
+        (($type eq "Incident") ? () : (WarnUnsigned => 1)),
         PathPrefix     => RT->Config->Get('WebPath') ."/Ticket/",
 );
 
diff --git a/html/RTIR/Display.html b/html/RTIR/Display.html
index f3f8d83..8801902 100644
--- a/html/RTIR/Display.html
+++ b/html/RTIR/Display.html
@@ -158,7 +158,7 @@
     <& /Elements/ShowHistory,
         Object         => $Ticket,
         ShowHeaders    => $ARGS{'ShowHeaders'},
-        DisplayPath    => RT::IR->HREFTo("Display.html?id=$id"),
+        DisplayPath    => RT::IR->HREFTo("Display.html"),
         UpdatePath     => RT::IR->HREFTo("Update.html"),
         ForwardPath    => RT::IR->HREFTo("Forward.html"),
         EncryptionPath => RT::IR->HREFTo("Crypt.html"),
diff --git a/html/RTIR/Incident/Display.html b/html/RTIR/Incident/Display.html
index 9c823fd..d489c48 100644
--- a/html/RTIR/Incident/Display.html
+++ b/html/RTIR/Incident/Display.html
@@ -161,7 +161,7 @@
     <& /Elements/ShowHistory,
         Object         => $TicketObj,
         ShowHeaders    => $ARGS{'ShowHeaders'},
-        DisplayPath    => RT::IR->HREFTo("Display.html?id=$id"),
+        DisplayPath    => RT::IR->HREFTo("Display.html"),
         UpdatePath     => RT::IR->HREFTo("Update.html"),
         ForwardPath    => RT::IR->HREFTo("Forward.html"),
         EncryptionPath => RT::IR->HREFTo("Crypt.html"),

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