rt 4.2.16

[freeside.git] / rt / share / html / Admin / Queues / index.html

diff --git a/rt/share/html/Admin/Queues/index.html b/rt/share/html/Admin/Queues/index.html
index b5a2bb4..e5fcb9d 100755 (executable)
--- a/rt/share/html/Admin/Queues/index.html
+++ b/rt/share/html/Admin/Queues/index.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -46,13 +46,30 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /Admin/Elements/Header, Title => loc("Admin queues") &>
-<& /Admin/Elements/QueueTabs, current_tab => 'Admin/Queues/', 
-    current_subtab => 'Admin/Queues/', 
-    Title => loc("Admin queues") &>
+<& /Elements/Tabs &>
 
+<h1><%$caption%></h1>
 
+<form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Queues/index.html">
+% foreach my $field( qw(Format Rows Page Order OrderBy) ) {
+%     next unless defined $ARGS{ $field } && length $ARGS{ $field };
+<input type="hidden" name="<% $field %>" value="<% $ARGS{ $field } %>" />
+% }
+
+<select name="QueueField">
+% foreach my $col (qw(Name Description CorrespondAddress CommentAddress InitialPriority FinalPriority DefaultDueIn Lifecycle SubjectTag)) {
+<option <% $QueueField eq $col ? 'selected="selected"' : '' |n %> value="<% $col %>"><% loc($col) %></option>
+% }
+</select>
+<& /Elements/SelectMatch, Name => 'QueueOp', Default => $QueueOp &>
+<input size="8" name="QueueString" value="<% $QueueString %>" />
+<br />
+
+<input type="checkbox" class="checkbox" id="FindDisabledQueues" name="FindDisabledQueues" value="1" <% $FindDisabledQueues? 'checked="checked"': '' |n%> />
+<label for="FindDisabledQueues"><&|/l&>Include disabled queues in listing.</&></label>
+<div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div>
+</form>
 
-<h1><%$caption%></h1>
 <p><&|/l&>Select a queue</&>:</p>
 % unless ( $queues->Count ) {
 <em><&|/l&>No queues matching search criteria found.</&></em>
@@ -60,6 +77,7 @@
 <& /Elements/CollectionList,
     OrderBy => 'Name',
     Order => 'ASC',
+    Rows  => $Rows,
     %ARGS,
     Format => $Format,
     Collection => $queues,
@@ -70,28 +88,9 @@
     )],
 &>
 % }
-<form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Queues/index.html">
-% foreach my $field( qw(Format Rows Page Order OrderBy) ) {
-%     next unless defined $ARGS{ $field } && length $ARGS{ $field };
-<input type="hidden" name="<% $field %>" value="<% $ARGS{ $field } %>" />
-% }
-
-<select name="QueueField">
-% foreach my $col (qw(Name Description CorrespondAddress CommentAddress InitialPriority FinalPriority DefaultDueIn)) {
-<option <% $QueueField eq $col ? 'selected="selected"' : '' |n %> value="<% $col %>"><% loc($col) %></option>
-% }
-</select>
-<& /Elements/SelectMatch, Name => 'QueueOp', Default => $QueueOp &>
-<input size="8" name="QueueString" value="<% $QueueString %>" />
-<br />
-
-<input type="checkbox" class="checkbox" name="FindDisabledQueues" value="1" <% $FindDisabledQueues? 'checked="checked"': '' |n%> />
-<&|/l&>Include disabled queues in listing.</&>
-<div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div> 
-</form>
 
 <%INIT>
-my $queues = new RT::Queues($session{'CurrentUser'});
+my $queues = RT::Queues->new($session{'CurrentUser'});
 $queues->FindAllRows if $FindDisabledQueues;
 
 my ($caption);
@@ -104,6 +103,8 @@ if ( defined $QueueString && length $QueueString ) {
         OPERATOR => $QueueOp,
         VALUE    => $QueueString,
     );
+    RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."Admin/Queues/Modify.html?id=".$queues->First->id)
+          if $queues->Count == 1;
 } else {
     $queues->UnLimit;
     $caption = $FindDisabledQueues
@@ -112,6 +113,7 @@ if ( defined $QueueString && length $QueueString ) {
 }
 
 $Format ||= RT->Config->Get('AdminSearchResultFormat')->{'Queues'};
+my $Rows = RT->Config->Get('AdminSearchResultRows')->{'Queues'} || 50;
 
 </%INIT>
 <%ARGS>
@@ -119,6 +121,6 @@ $FindDisabledQueues => 0
 $Format             => undef
 
 $QueueField         => 'Name'
-$QueueOp            => '='
+$QueueOp            => 'LIKE'
 $QueueString        => ''
 </%ARGS>