diff options
Diffstat (limited to 'rt/share/html/Admin/Queues/Modify.html')
-rwxr-xr-x | rt/share/html/Admin/Queues/Modify.html | 74 |
1 files changed, 44 insertions, 30 deletions
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> |