[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-1071-g7ad504c

[Alex Vandiver]

The branch, 3.9-trunk has been updated
       via  7ad504c443ad91261a64d9fba60d0551dce45098 (commit)
       via  d033518bb938a318782d96d1931dbcd4efb00abe (commit)
       via  c04d9e903b0a8bb8b7f8f15a19de00ad2ca79cb4 (commit)
       via  b651c7177fc841e1a3dd7ee6f4c06924ac8561be (commit)
       via  b4044e8b15e8ea8830bbf7240c4b005c836e82b7 (commit)
      from  f6247f0e2a38008c3885dc77ebb1bf8eeabce667 (commit)

Summary of changes:
 lib/RT/Interface/Web.pm                       |   31 +++++++++++
 share/html/Admin/Articles/Classes/Modify.html |    7 +--
 share/html/Admin/CustomFields/Modify.html     |    9 +---
 share/html/Admin/Groups/Modify.html           |    7 +--
 share/html/Admin/Queues/Modify.html           |    9 +--
 share/html/Admin/Users/Modify.html            |    9 +--
 share/html/Articles/Article/Edit.html         |    9 +--
 share/html/Dashboards/Modify.html             |   10 ++--
 share/html/Elements/MaybeRedirectForResults   |   67 -------------------------
 share/html/Ticket/Display.html                |   11 ++--
 share/html/index.html                         |    9 ++--
 11 files changed, 59 insertions(+), 119 deletions(-)
 delete mode 100644 share/html/Elements/MaybeRedirectForResults

- Log -----------------------------------------------------------------
commit d033518bb938a318782d96d1931dbcd4efb00abe
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Dec 27 17:12:32 2010 -0500

    Remove some repitition by assuming the current request past on self-redirect

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index 38d6314..91504c0 100755
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -1092,7 +1092,7 @@ sub Abort {
 
 sub MaybeRedirectForResults {
     my %args = (
-        Path      => undef,
+        Path      => $HTML::Mason::Commands::m->request_comp->path,
         Arguments => {},
         Anchor    => undef,
         Actions   => undef,
diff --git a/share/html/Admin/Articles/Classes/Modify.html b/share/html/Admin/Articles/Classes/Modify.html
index fa460b4..fc653be 100644
--- a/share/html/Admin/Articles/Classes/Modify.html
+++ b/share/html/Admin/Articles/Classes/Modify.html
@@ -124,7 +124,6 @@ if ($ClassObj->Id()) {
 # This code does automatic redirection if any updates happen.
 MaybeRedirectForResults(
     Actions     => \@results,
-    Path        => '/Admin/Articles/Classes/Modify.html',
     Arguments   => { id => $ClassObj->Id },
 );
 
diff --git a/share/html/Admin/CustomFields/Modify.html b/share/html/Admin/CustomFields/Modify.html
index 80ce81c..3a32146 100644
--- a/share/html/Admin/CustomFields/Modify.html
+++ b/share/html/Admin/CustomFields/Modify.html
@@ -272,7 +272,6 @@ $id = $CustomFieldObj->id if $CustomFieldObj->id;
 # This code does automatic redirection if any updates happen.
 MaybeRedirectForResults(
     Actions     => \@results,
-    Path        => '/Admin/CustomFields/Modify.html',
     Arguments   => { id => $id },
 );
 
diff --git a/share/html/Admin/Groups/Modify.html b/share/html/Admin/Groups/Modify.html
index e210609..b5cac3b 100755
--- a/share/html/Admin/Groups/Modify.html
+++ b/share/html/Admin/Groups/Modify.html
@@ -156,7 +156,6 @@ if  ( ($SetEnabled) and ( $Disabled != $Group->Disabled) ) {
 # This code does automatic redirection if any updates happen.
 MaybeRedirectForResults(
     Actions     => \@results,
-    Path        => '/Admin/Groups/Modify.html',
     Arguments   => { id => $Group->id },
 );
 
diff --git a/share/html/Admin/Queues/Modify.html b/share/html/Admin/Queues/Modify.html
index 4fc64b7..187f70c 100755
--- a/share/html/Admin/Queues/Modify.html
+++ b/share/html/Admin/Queues/Modify.html
@@ -228,7 +228,6 @@ if ( $QueueObj->Id ) {
 # This code does automatic redirection if any updates happen.
 MaybeRedirectForResults(
     Actions   => \@results,
-    Path      => '/Admin/Queues/Modify.html',
     Arguments => { id => $QueueObj->Id },
 );
 
diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
index 3b6b27e..ebb7901 100755
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@ -370,7 +370,6 @@ if (!$Create && $UserObj->Privileged()) {
 # This code does automatic redirection if any updates happen.
 MaybeRedirectForResults(
     Actions   => \@results,
-    Path      => '/Admin/Users/Modify.html',
     Arguments => { id => $UserObj->Id },
 );
 
diff --git a/share/html/Articles/Article/Edit.html b/share/html/Articles/Article/Edit.html
index a105a5a..1842e79 100644
--- a/share/html/Articles/Article/Edit.html
+++ b/share/html/Articles/Article/Edit.html
@@ -214,7 +214,6 @@ elsif ( $id eq 'new' ) {
         else {
             MaybeRedirectForResults(
                 Actions   => \@results,
-                Path      => '/Articles/Article/Edit.html',
                 Arguments => { id => $ArticleObj->id },
             );
         }
diff --git a/share/html/Ticket/Display.html b/share/html/Ticket/Display.html
index e254d0e..df52595 100755
--- a/share/html/Ticket/Display.html
+++ b/share/html/Ticket/Display.html
@@ -196,7 +196,7 @@ $m->callback(
 # This code does automatic redirection if any updates happen. 
 MaybeRedirectForResults(
     Actions   => \@Actions,
-    Path      => 'Ticket/Display.html',
+    Path      => "/Ticket/Display.html",
     Anchor    => $ARGS{'Anchor'},
     Arguments => { id => $TicketObj->id },
 );
diff --git a/share/html/index.html b/share/html/index.html
index 79832ae..bfa8afc 100755
--- a/share/html/index.html
+++ b/share/html/index.html
@@ -119,7 +119,7 @@ if ( $ARGS{'QuickCreate'} ) {
         if ( $t && $t->Id && RT->Config->Get('DisplayTicketAfterQuickCreate', $session{'CurrentUser'}) ) {
             MaybeRedirectForResults(
                 Actions   => \@results,
-                Path      => 'Ticket/Display.html',
+                Path      => '/Ticket/Display.html',
                 Arguments => { id => $t->Id },
             );
         }

commit 7ad504c443ad91261a64d9fba60d0551dce45098
Merge: f6247f0 d033518
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Dec 27 17:26:16 2010 -0500

    Merge branch '3.9-maybe_redirect' into 3.9-trunk


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