[Rt-commit] [rtir] 01/01: add IncludeWebPath=>0 to RT::IR->HREFTo calls for RT::Interface::Web::MaybeRedirectForResults

[Dustin Graves]

This is an automated email from the git hooks/post-receive script.

dustin pushed a commit to branch 3.4/fix-ticket-create-non-root-webpath
in repository rtir.

commit 503b5d2f0da1686541e77f5fbdec5f37a7436d04
Author: Dustin Graves <dustin at bestpractical.com>
Date:   Mon Feb 22 21:46:42 2016 +0000

    add IncludeWebPath=>0 to RT::IR->HREFTo calls for RT::Interface::Web::MaybeRedirectForResults
    
    MaybeRedirectForResults already adds WebPath and we were getting the
    WebPath twice in the URL from these redirects
    
    Fixes: I#31691
---
 html/RTIR/Advanced.html             | 4 ++--
 html/RTIR/Display.html              | 2 +-
 html/RTIR/Edit.html                 | 4 ++--
 html/RTIR/Incident/Create.html      | 2 +-
 html/RTIR/Incident/Display.html     | 2 +-
 html/RTIR/Incident/Reply/index.html | 2 +-
 html/RTIR/Merge/index.html          | 2 +-
 html/RTIR/Report/BulkReject.html    | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/html/RTIR/Advanced.html b/html/RTIR/Advanced.html
index 6d5adab..18ca6a4 100644
--- a/html/RTIR/Advanced.html
+++ b/html/RTIR/Advanced.html
@@ -129,8 +129,8 @@ if ( $ARGS{'SaveChanges'} ) {
     MaybeRedirectForResults(
         Actions   => \@results,
         Path      => RT->Config->Get('DisplayAfterEdit', $session{'CurrentUser'})
-        ? RT::IR->HREFTo("Display.html")
-        : RT::IR->HREFTo("Advanced.html")
+        ? RT::IR->HREFTo("Display.html", IncludeWebPath => 0)
+        : RT::IR->HREFTo("Advanced.html", IncludeWebPath => 0)
         ,
         Arguments => { id => $Ticket->id },
     );
diff --git a/html/RTIR/Display.html b/html/RTIR/Display.html
index 85aa3c8..f84e103 100644
--- a/html/RTIR/Display.html
+++ b/html/RTIR/Display.html
@@ -266,7 +266,7 @@ if ( $ARGS{'MarkAsSeen'} ) {
 $ARGS{'id'} = $id = $Ticket->Id;
 
 MaybeRedirectForResults(
-    Path      => RT::IR->HREFTo("Display.html"),
+    Path      => RT::IR->HREFTo("Display.html", IncludeWebPath => 0),
     Actions   => \@results,
     Arguments => { id => $id },
     Anchor    => $ARGS{'Anchor'},
diff --git a/html/RTIR/Edit.html b/html/RTIR/Edit.html
index 7b4bfcd..6d9baf6 100644
--- a/html/RTIR/Edit.html
+++ b/html/RTIR/Edit.html
@@ -240,8 +240,8 @@ if ( $SaveChanges && !$checks_failure && !$OnlySearchForPeople ) {
     MaybeRedirectForResults(
         Actions   => \@results,
         Path      => RT->Config->Get('DisplayAfterEdit', $session{'CurrentUser'})
-        ? RT::IR->HREFTo("Display.html")
-        : RT::IR->HREFTo("Edit.html")
+        ? RT::IR->HREFTo("Display.html", IncludeWebPath => 0)
+        : RT::IR->HREFTo("Edit.html", IncludeWebPath => 0)
         ,
         Arguments => { id => $id },
     );
diff --git a/html/RTIR/Incident/Create.html b/html/RTIR/Incident/Create.html
index 14636f3..3494189 100644
--- a/html/RTIR/Incident/Create.html
+++ b/html/RTIR/Incident/Create.html
@@ -449,7 +449,7 @@ if ( !$checks_failure && $CreateIncident ) {
 
         MaybeRedirectForResults(
             Actions   => \@results,
-            Path      => RT::IR->HREFTo("Incident/Display.html"),
+            Path      => RT::IR->HREFTo("Incident/Display.html", IncludeWebPath => 0),
             Arguments => { id => $inc_obj->id },
         );
     }
diff --git a/html/RTIR/Incident/Display.html b/html/RTIR/Incident/Display.html
index 1c79add..33cc35a 100644
--- a/html/RTIR/Incident/Display.html
+++ b/html/RTIR/Incident/Display.html
@@ -316,7 +316,7 @@ if ( $ARGS{'MarkAsSeen'} ) {
 
 MaybeRedirectForResults(
     Actions   => \@results,
-    Path      => RT::IR->HREFTo("Display.html"),
+    Path      => RT::IR->HREFTo("Display.html", IncludeWebPath => 0),
     Arguments => { id => $TicketObj->id },
     Anchor    => $ARGS{'Anchor'},
 );
diff --git a/html/RTIR/Incident/Reply/index.html b/html/RTIR/Incident/Reply/index.html
index afec889..c7cabd1 100644
--- a/html/RTIR/Incident/Reply/index.html
+++ b/html/RTIR/Incident/Reply/index.html
@@ -222,7 +222,7 @@ if ( $SubmitTicket && !$checks_failure ) {
     );
     MaybeRedirectForResults(
         Actions   => \@results,
-        Path      => RT::IR->HREFTo("Incident/Display.html"),
+        Path      => RT::IR->HREFTo("Incident/Display.html", IncludeWebPath => 0),
         Arguments => { %$pass, id => $id },
     );
 }
diff --git a/html/RTIR/Merge/index.html b/html/RTIR/Merge/index.html
index c2e5aec..7cd5eeb 100644
--- a/html/RTIR/Merge/index.html
+++ b/html/RTIR/Merge/index.html
@@ -137,7 +137,7 @@ if ( $MergeTicket && !$checks_failure ) {
 
     MaybeRedirectForResults(
         Actions   => \@results,
-        Path      => RT::IR->HREFTo("Display.html"),
+        Path      => RT::IR->HREFTo("Display.html", IncludeWebPath => 0),
         Arguments => { id => $Ticket->id },
     );
 }
diff --git a/html/RTIR/Report/BulkReject.html b/html/RTIR/Report/BulkReject.html
index cbfe84c..7e152f5 100644
--- a/html/RTIR/Report/BulkReject.html
+++ b/html/RTIR/Report/BulkReject.html
@@ -147,7 +147,7 @@ if ( $BulkReject ) {
     if ( $BulkRejectAndReturn ) {
         MaybeRedirectForResults(
             Actions => \@results,
-            Path    => RT::IR->HREFTo(''),
+            Path    => RT::IR->HREFTo('', IncludeWebPath => 0),
             Force   => 1,
         );
     }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.