diff options
Diffstat (limited to 'rt/share/html/Admin/Queues')
| -rw-r--r-- | rt/share/html/Admin/Queues/History.html | 5 | ||||
| -rwxr-xr-x | rt/share/html/Admin/Queues/Modify.html | 74 | ||||
| -rwxr-xr-x | rt/share/html/Admin/Queues/People.html | 5 | ||||
| -rwxr-xr-x | rt/share/html/Admin/Queues/Scrip.html | 77 | ||||
| -rwxr-xr-x | rt/share/html/Admin/Queues/Scrips.html | 15 | ||||
| -rwxr-xr-x | rt/share/html/Admin/Queues/Template.html | 10 | ||||
| -rwxr-xr-x | rt/share/html/Admin/Queues/index.html | 45 |
7 files changed, 78 insertions, 153 deletions
diff --git a/rt/share/html/Admin/Queues/History.html b/rt/share/html/Admin/Queues/History.html index 1b4a1abed..8b74a4782 100644 --- a/rt/share/html/Admin/Queues/History.html +++ b/rt/share/html/Admin/Queues/History.html @@ -48,9 +48,10 @@ <& /Admin/Elements/Header, Title => $title &> <& /Elements/Tabs &> -<& /Ticket/Elements/ShowHistory, - Ticket => $QueueObj, +<& /Elements/ShowHistory, + Object => $QueueObj, ShowDisplayModes => 0, + DisplayPath => 'History.html', &> <%INIT> diff --git a/rt/share/html/Admin/Queues/Modify.html b/rt/share/html/Admin/Queues/Modify.html index e9afc7ec5..9610b2519 100755 --- a/rt/share/html/Admin/Queues/Modify.html +++ b/rt/share/html/Admin/Queues/Modify.html @@ -52,26 +52,33 @@ <form action="<%RT->Config->Get('WebPath')%>/Admin/Queues/Modify.html" name="ModifyQueue" method="post" enctype="multipart/form-data"> -<input type="hidden" class="hidden" name="SetEnabled" value="1" /> <input type="hidden" class="hidden" name="id" value="<% $Create? 'new': $QueueObj->Id %>" /> <table> -<tr><td align="right"><&|/l&>Queue Name</&>:</td> -<td colspan="3"><input name="Name" value="<% $Create ? "" : $QueueObj->Name || $Name %>" /></td> -</tr> +<tr><td align="right"><&|/l&>Queue Name</&>:</td><td colspan="3"> +% if ($InternalQueue) { +<% $QueueObj->Name %> +% } else { +<input name="Name" value="<% $Create ? "" : $QueueObj->Name || $Name %>" /> +% } +</td></tr> <tr><td align="right"><&|/l&>Description</&>:</td> <td colspan="3"><input name="Description" value="<% $Create ? "" : $QueueObj->Description || $Description || '' %>" size="60" /></td> </tr> -<tr><td align="right"><&|/l&>Lifecycle</&>:</td> -<td colspan="3"><& /Widgets/Form/Select:InputOnly, +<tr><td align="right"><&|/l&>Lifecycle</&>:</td><td colspan="3"> +% if ($InternalQueue) { +<% $QueueObj->Lifecycle %> +% } else { +<& /Widgets/Form/Select:InputOnly, Name => 'Lifecycle', Values => [ sort { loc($a) cmp loc($b) } RT::Lifecycle->List ], CurrentValue => $Create ? "default" : $QueueObj->Lifecycle || $ARGS{'Lifecycle'}, Default => 0, -&></td> -</tr> +&> +% } +</td></tr> <tr><td align="right"><&|/l&>Subject Tag</&>:</td> <td colspan="3"><input name="SubjectTag" value="<% $ARGS{'SubjectTag'} || ($Create ? "" : $QueueObj->SubjectTag || '' ) %>" size="60" /></td> @@ -104,38 +111,40 @@ % my $CFs = $QueueObj->CustomFields; % while (my $CF = $CFs->Next) { <tr valign="top"><td align="right"> -<% loc($CF->Name) %>: +<% $CF->Name %>: </td><td> -<& /Elements/EditCustomField, CustomField => $CF, - Object => $QueueObj, - ($Create ? (NamePrefix => 'Object-RT::Queue--CustomField-') - : () )&> +<& /Elements/EditCustomField, CustomField => $CF, + Object => $QueueObj, &> </td></tr> % } -% if ( RT->Config->Get('GnuPG')->{'Enable'} ) { -<tr><td align="right"><input type="checkbox" class="checkbox" name="Sign" value="1" <% $QueueObj->Sign? 'checked="checked"': '' |n%> /></td> -<td><&|/l&>Sign by default</&></td> -<td align="right"><input type="checkbox" class="checkbox" name="Encrypt" value="1" <% $QueueObj->Encrypt? 'checked="checked"': '' |n%> /></td> -<td><&|/l&>Encrypt by default</&></td> +% if ( RT->Config->Get('Crypt')->{'Enable'} ) { +<tr><td align="right"><input type="checkbox" class="checkbox" id="Sign" name="Sign" value="1" <% $QueueObj->Sign? 'checked="checked"': '' |n%> /></td> +<td><label for="Sign"><&|/l&>Sign by default</&></label></td> +<td align="right"><input type="checkbox" class="checkbox" id="Encrypt" name="Encrypt" value="1" <% $QueueObj->Encrypt? 'checked="checked"': '' |n%> /></td> +<td><label for="Encrypt"><&|/l&>Encrypt by default</&></label></td> </tr> -<tr><td align="right"><input type="checkbox" class="checkbox" name="SignAuto" value="1" <% $QueueObj->SignAuto? 'checked="checked"': '' |n%> /></td> -<td colspan="3"><&|/l_unsafe, "<b>","</b>","<i>","</i>"&>Sign all auto-generated mail. [_1]Caution[_2]: Enabling this option alters the signature from providing [_3]authentication[_4] to providing [_3]integrity[_4].</&></td></tr> +<tr><td align="right"><input type="checkbox" class="checkbox" id="SignAuto" name="SignAuto" value="1" <% $QueueObj->SignAuto? 'checked="checked"': '' |n%> /></td> +<td colspan="3"><label for="SignAuto"><&|/l_unsafe, "<b>","</b>","<i>","</i>"&>Sign all auto-generated mail. [_1]Caution[_2]: Enabling this option alters the signature from providing [_3]authentication[_4] to providing [_3]integrity[_4].</&></label></td></tr> % } -<tr><td align="right"><input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked|n%> /></td> -<td colspan="3"><&|/l&>Enabled (Unchecking this box disables this queue)</&><br /> +% unless ($InternalQueue) { +<tr><td align="right"><input type="checkbox" class="checkbox" id="Enabled" name="Enabled" value="1" <%$EnabledChecked|n%> /></td> +<td colspan="3"><label for="Enabled"><&|/l&>Enabled (Unchecking this box disables this queue)</&></label><br /> +<input type="hidden" class="hidden" name="SetEnabled" value="1" /> % $m->callback( %ARGS, QueueObj => $QueueObj, results => \@results ); </td></tr> +% } -% if ( RT->Config->Get('GnuPG')->{'Enable'} ) { +% if ( RT->Config->Get('Crypt')->{'Enable'} ) { <tr><td colspan="4"> +<input type="hidden" class="hidden" name="SetCrypt" value="1" /> % if ( my $email = $QueueObj->CorrespondAddress || RT->Config->Get('CorrespondAddress') ) { <& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &> % } else { -<&|/Widgets/TitleBox, title => loc( 'GnuPG private keys') &> -<i><&|/l&>You have enabled GnuPG support but have not set a correspondence address for this queue.</&> -<&|/l&>You must set a correspondence address for this queue in order to configure a GnuPG private key.</&></i> +<&|/Widgets/TitleBox, title => loc( 'Private keys') &> +<i><&|/l&>You have enabled encryption support but have not set a correspondence address for this queue.</&> +<&|/l&>You must set a correspondence address for this queue in order to configure a private key.</&></i> </&> % } </td></tr> @@ -143,9 +152,9 @@ % if ( my $email = $QueueObj->CommentAddress || RT->Config->Get('CommentAddress') ) { <& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &> % } else { -<&|/Widgets/TitleBox, title => loc( 'GnuPG private keys') &> -<i><&|/l&>You have enabled GnuPG support but have not set a comment address for this queue.</&> -<&|/l&>You must set a comment address for this queue in order to configure a GnuPG private key.</&></i> +<&|/Widgets/TitleBox, title => loc( 'Private keys') &> +<i><&|/l&>You have enabled encryption support but have not set a comment address for this queue.</&> +<&|/l&>You must set a comment address for this queue in order to configure a private key.</&></i> </&> %} </td></tr> @@ -188,8 +197,10 @@ if ( $QueueObj->Id ) { # we're asking about enabled on the web page but really care about disabled if ( $SetEnabled ) { $Disabled = $ARGS{'Disabled'} = $Enabled? 0: 1; + } + if ( $SetCrypt ) { $ARGS{$_} = 0 foreach grep !defined $ARGS{$_} || !length $ARGS{$_}, - qw(Sign SignAuto Encrypt Disabled); + qw(Sign SignAuto Encrypt); } $m->callback( @@ -229,6 +240,8 @@ if ( $QueueObj->Id ) { $title = loc("Create a queue"); } +my $InternalQueue = ($QueueObj->Id and $QueueObj->Disabled == 2); + # This code does automatic redirection if any updates happen. MaybeRedirectForResults( Actions => \@results, @@ -251,5 +264,6 @@ $InitialPriority => undef $FinalPriority => undef $DefaultDueIn => undef $SetEnabled => undef +$SetCrypt => undef $Enabled => undef </%ARGS> diff --git a/rt/share/html/Admin/Queues/People.html b/rt/share/html/Admin/Queues/People.html index 8a226e894..2d0bb910a 100755 --- a/rt/share/html/Admin/Queues/People.html +++ b/rt/share/html/Admin/Queues/People.html @@ -174,10 +174,7 @@ if ( $ARGS{'UserString'} ) { if ( $ARGS{'GroupString'} ) { $Groups = RT::Groups->new( $session{'CurrentUser'} ); - $Groups->Limit( FIELD => 'Domain', - OPERATOR => '=', - VALUE => 'UserDefined' - ); + $Groups->LimitToUserDefinedGroups; $Groups->Limit( FIELD => $ARGS{'GroupField'}, VALUE => $ARGS{'GroupString'}, OPERATOR => $ARGS{'GroupOp'} diff --git a/rt/share/html/Admin/Queues/Scrip.html b/rt/share/html/Admin/Queues/Scrip.html deleted file mode 100755 index d4f349929..000000000 --- a/rt/share/html/Admin/Queues/Scrip.html +++ /dev/null @@ -1,77 +0,0 @@ -%# BEGIN BPS TAGGED BLOCK {{{ -%# -%# COPYRIGHT: -%# -%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC -%# <sales@bestpractical.com> -%# -%# (Except where explicitly superseded by other copyright notices) -%# -%# -%# LICENSE: -%# -%# This work is made available to you under the terms of Version 2 of -%# the GNU General Public License. A copy of that license should have -%# been provided with this software, but in any event can be snarfed -%# from www.gnu.org. -%# -%# This work is distributed in the hope that it will be useful, but -%# WITHOUT ANY WARRANTY; without even the implied warranty of -%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -%# General Public License for more details. -%# -%# You should have received a copy of the GNU General Public License -%# along with this program; if not, write to the Free Software -%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -%# 02110-1301 or visit their web page on the internet at -%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. -%# -%# -%# CONTRIBUTION SUBMISSION POLICY: -%# -%# (The following paragraph is not intended to limit the rights granted -%# to you to modify and distribute this software under the terms of -%# the GNU General Public License and is only of importance to you if -%# you choose to contribute your changes and enhancements to the -%# community by submitting them to Best Practical Solutions, LLC.) -%# -%# By intentionally submitting any modifications, corrections or -%# derivatives to this work, or any other work intended for use with -%# Request Tracker, to Best Practical Solutions, LLC, you confirm that -%# you are the copyright holder for those contributions and you grant -%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable, -%# royalty-free, perpetual, license to use, copy, create derivative -%# works based on those contributions, and sublicense and distribute -%# those contributions and any derivatives thereof. -%# -%# END BPS TAGGED BLOCK }}} -<& /Admin/Elements/Header, Title => $title &> -<& /Elements/Tabs &> - -<& /Elements/ListActions, actions => \@results &> -<& /Admin/Elements/EditScrip, title => $title, %ARGS, id => $id &> - -<%init> -my $QueueObj = RT::Queue->new( $session{'CurrentUser'} ); -$QueueObj->Load( $Queue ); -unless( $QueueObj->id ) { - Abort(loc("Queue [_1] not found", $id)); -} - -my ($title); - -($id, my @results) = $m->comp( '/Admin/Elements/EditScrip:Process', %ARGS ); - -if ( $id ) { - $title = loc("Modify a scrip for queue [_1]", $QueueObj->Name); -} else { - $title = loc("Create a scrip for queue [_1]", $QueueObj->Name); -} - - -</%init> - -<%ARGS> -$id => undef -$Queue => undef -</%ARGS> diff --git a/rt/share/html/Admin/Queues/Scrips.html b/rt/share/html/Admin/Queues/Scrips.html index 02d91a053..e179cce92 100755 --- a/rt/share/html/Admin/Queues/Scrips.html +++ b/rt/share/html/Admin/Queues/Scrips.html @@ -47,24 +47,13 @@ %# END BPS TAGGED BLOCK }}} <& /Admin/Elements/Header, Title => $title &> <& /Elements/Tabs &> - -% unless ( $QueueObj->Disabled ) { # Global scrips does not apply to disabled queues -<h2><&|/l&>Scrips which apply to all queues</&></h2> -<& /Admin/Elements/ListGlobalScrips &> -<br /> -% } <& /Admin/Elements/EditScrips, title => $title, %ARGS &> <%init> my $QueueObj = RT::Queue->new($session{'CurrentUser'}); $QueueObj->Load($id); +Abort(loc("Queue [_1] not found",$id)) unless $QueueObj->id; -my $title; - -if ($QueueObj->id) { - $title = loc("Modify scrips for queue [_1]", $QueueObj->Name); -} else { - Abort(loc("Queue [_1] not found",$id)); -} +my $title = loc("Modify scrips for queue [_1]", $QueueObj->Name); </%init> <%ARGS> diff --git a/rt/share/html/Admin/Queues/Template.html b/rt/share/html/Admin/Queues/Template.html index 8e4cd2362..7e58ec787 100755 --- a/rt/share/html/Admin/Queues/Template.html +++ b/rt/share/html/Admin/Queues/Template.html @@ -59,10 +59,10 @@ %# hang onto the queue id <input type="hidden" class="hidden" name="Queue" value="<%$Queue%>" /> <& /Admin/Elements/ModifyTemplate, - Name => $TemplateObj->Name, - Description => $TemplateObj->Description, - Content => $TemplateObj->Content, - Type => $TemplateObj->Type + Name => $TemplateObj->Name // $ARGS{Name}, + Description => $TemplateObj->Description // $ARGS{Description}, + Content => $TemplateObj->Content // $ARGS{Content}, + Type => $TemplateObj->Type // $ARGS{Type}, &> <& /Elements/Submit, Label => $SubmitLabel, Reset => 1 &> </form> @@ -80,7 +80,6 @@ if ( !$Create ) { if ( $Template eq 'new' ) { my ( $val, $msg ) = $TemplateObj->Create( Queue => $Queue, Name => $Name, Type => $Type ); - Abort( loc( "Could not create template: [_1]", $msg ) ) unless ($val); push @results, $msg; } else { $TemplateObj->Load($Template) || Abort( loc('No Template') ); @@ -102,6 +101,7 @@ if ( $TemplateObj->Id() ) { my ( $ok, $msg ) = $TemplateObj->CompileCheck; push @results, $msg if !$ok; } else { + $Create = 1; $QueueObj = RT::Queue->new( $session{'CurrentUser'} ); $QueueObj->Load($Queue); } diff --git a/rt/share/html/Admin/Queues/index.html b/rt/share/html/Admin/Queues/index.html index 672b4fac1..4b01825a2 100755 --- a/rt/share/html/Admin/Queues/index.html +++ b/rt/share/html/Admin/Queues/index.html @@ -48,9 +48,28 @@ <& /Admin/Elements/Header, 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> @@ -58,7 +77,7 @@ <& /Elements/CollectionList, OrderBy => 'Name', Order => 'ASC', - Rows => 50, + Rows => $Rows, %ARGS, Format => $Format, Collection => $queues, @@ -69,25 +88,6 @@ )], &> % } -<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 = RT::Queues->new($session{'CurrentUser'}); @@ -113,6 +113,7 @@ if ( defined $QueueString && length $QueueString ) { } $Format ||= RT->Config->Get('AdminSearchResultFormat')->{'Queues'}; +my $Rows = RT->Config->Get('AdminSearchResultRows')->{'Queues'} || 50; </%INIT> <%ARGS> @@ -120,6 +121,6 @@ $FindDisabledQueues => 0 $Format => undef $QueueField => 'Name' -$QueueOp => '=' +$QueueOp => 'LIKE' $QueueString => '' </%ARGS> |