[Rt-commit] rtir branch, 4.0-trunk, updated. 4.0.0-38-ga6bf40d

[Shawn Moore]

The branch, 4.0-trunk has been updated
       via  a6bf40de224778e58a258583ba4ea761b373156a (commit)
      from  11322003cc779a5c5f700777cf880ada93e3807b (commit)

Summary of changes:
 html/RTIR/Display.html          | 2 +-
 html/RTIR/Incident/Display.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit a6bf40de224778e58a258583ba4ea761b373156a
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri Mar 31 20:04:23 2017 +0000

    Fix Show email link under "immediate" show history
    
    Without this fix, we were generating links to
    /RTIR/Ticket/ShowEmailRecord.html which does not exist. Now we correctly
    link to /Ticket/ShowEmailRecord.html.
    
    This also fixes the links to attachments in the transaction log (which
    were linking to the nonexistent /RTIR/Ticket/Attachment/…)
    
    This new PathPrefix value corresponds to the one we provide in the
    ExtraShowHistoryArguments callback, which is why it works for the
    various deferred show history preferences.
    
    Fixes: T#183105

diff --git a/html/RTIR/Display.html b/html/RTIR/Display.html
index 0eed719..ba0c582 100644
--- a/html/RTIR/Display.html
+++ b/html/RTIR/Display.html
@@ -169,7 +169,7 @@
         ForwardPath    => RT::IR->HREFTo("Forward.html"),
         EncryptionPath => RT::IR->HREFTo("Crypt.html"),
         WarnUnsigned   => 1,
-        PathPrefix     => RT::IR->HREFTo("Ticket/"),
+        PathPrefix     => RT->Config->Get('WebPath') ."/Ticket/",
     &>
 % }
 
diff --git a/html/RTIR/Incident/Display.html b/html/RTIR/Incident/Display.html
index 21a9bb1..5bf8e89 100644
--- a/html/RTIR/Incident/Display.html
+++ b/html/RTIR/Incident/Display.html
@@ -171,7 +171,7 @@
         UpdatePath     => RT::IR->HREFTo("Update.html"),
         ForwardPath    => RT::IR->HREFTo("Forward.html"),
         EncryptionPath => RT::IR->HREFTo("Crypt.html"),
-        PathPrefix     => RT::IR->HREFTo("Ticket/")
+        PathPrefix     => RT->Config->Get('WebPath') ."/Ticket/",
     &>
 % }
 

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