starting to work...

1 files changed, 4 insertions, 6 deletions

diff --git a/rt/share/html/Admin/Elements/EditScrips b/rt/share/html/Admin/Elements/EditScrips
index be208d6c4..2fdcae670 100755
--- a/rt/share/html/Admin/Elements/EditScrips
+++ b/rt/share/html/Admin/Elements/EditScrips
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -89,12 +89,14 @@ if ( $id ) {
 
 if ($QueueObj->id) {
     $Scrips->LimitToQueue($id);
+    $Format ||= RT->Config->Get('AdminSearchResultFormat')->{'Scrips'};
 }
 else {
     $Scrips->LimitToGlobal();
+    $Format ||= RT->Config->Get('AdminSearchResultFormat')->{'GlobalScrips'};
 }
 
-# {{{ deal with modifying and deleting existing scrips
+# deal with modifying and deleting existing scrips
 # we still support DeleteScrip-id format but array is preferred
 foreach my $id ( grep $_, @DeleteScrip, map /^DeleteScrip-(\d+)/, keys %ARGS ) {
     my $scrip = RT::Scrip->new($session{'CurrentUser'});
@@ -107,10 +109,6 @@ foreach my $id ( grep $_, @DeleteScrip, map /^DeleteScrip-(\d+)/, keys %ARGS ) {
         push @actions, $msg;
     }
 }
-# }}}
-
-$Format ||= RT->Config->Get('AdminSearchResultFormat')->{'Scrips'};
-
 </%init>
 
 <%ARGS>