[Rt-commit] rt branch, admin_ui, updated. e953929ef14c7b241a50e2ac066f56a8a814db9f

[sunnavy at bestpractical.com]

The branch, admin_ui has been updated
       via  e953929ef14c7b241a50e2ac066f56a8a814db9f (commit)
      from  c3bdb22943dff621b282d2cb0dd3b63c867dafd7 (commit)

Summary of changes:
 lib/RT/Dispatcher.pm |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit e953929ef14c7b241a50e2ac066f56a8a814db9f
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Jan 14 13:38:27 2010 +0800

    tweak finding queue, id from request actions

diff --git a/lib/RT/Dispatcher.pm b/lib/RT/Dispatcher.pm
index dd403d3..d6cbd45 100644
--- a/lib/RT/Dispatcher.pm
+++ b/lib/RT/Dispatcher.pm
@@ -440,6 +440,15 @@ before 'admin/' => run {
       /;
 
     for my $action ( Jifty->web->request->actions ) {
+        if ( Jifty->web->request->path =~ m{^/admin/queues/templates} ) {
+            if ( $action->argument('queue') ) {
+                $queue = $action->argument('queue');
+            }
+            if ( $action->argument('id') ) {
+                $id = $action->argument('id');
+            }
+        }
+
         if ( grep { $action->moniker eq $_ } @monikers ) {
             if ( $action->argument('record_id') ) {
                 $id = $action->argument('record_id');
@@ -452,9 +461,6 @@ before 'admin/' => run {
                 $lookup_type = $action->argument('lookup_type');
             }
 
-            if ( Jifty->web->request->path =~ m{admin/queues/templates} ) {
-                $queue = $action->argument('queue');
-            }
         }
     }
 

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