[Rt-commit] r7719 - in rt/branches/3.7-EXPERIMENTAL: .
html/Admin/Queues
ruz at bestpractical.com
ruz at bestpractical.com
Sat Apr 28 19:59:59 EDT 2007
Author: ruz
Date: Sat Apr 28 19:59:56 2007
New Revision: 7719
Modified:
rt/branches/3.7-EXPERIMENTAL/ (props changed)
rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/Modify.html
rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html
rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html
Log:
r5181 at cubic-pc: cubic | 2007-04-29 03:51:37 +0400
* show crypto interfaces only if GnuPG is enabled
Modified: rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/Modify.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/Modify.html (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Admin/Queues/Modify.html Sat Apr 28 19:59:56 2007
@@ -85,23 +85,27 @@
<td colspan="3"><input name="DefaultDueIn" value="<% ($Create) ? "" : $QueueObj->DefaultDueIn%>" /> <&|/l&>days</&>.</td>
</tr>
+% if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
<tr><td align="right"><input type="checkbox" class="checkbox" name="Sign" value="1" <% $QueueObj->Sign? 'checked': '' %> /></td>
<td><&|/l&>Sign by default</&></td>
<td align="right"><input type="checkbox" class="checkbox" name="Encrypt" value="1" <% $QueueObj->Encrypt? 'checked': '' %> /></td>
<td><&|/l&>Encrypt by default</&></td>
</tr>
+% }
<tr><td align="right"><input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked%> /></td>
<td colspan="3"><&|/l&>Enabled (Unchecking this box disables this queue)</&><br />
% $m->callback( %ARGS, QueueObj => $QueueObj, results => \@results );
</td></tr>
+% if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
% if ( my $email = $QueueObj->CorrespondAddress || RT->Config->Get('CorrespondAddress') ) {
<tr><td colspan="4"><& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &></td></tr>
% }
% if ( my $email = $QueueObj->CommentAddress || RT->Config->Get('CommentAddress') ) {
<tr><td colspan="4"><& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &></td></tr>
% }
+% }
</table>
<& /Elements/Submit, Label => loc('Save Changes') &>
Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Create.html Sat Apr 28 19:59:56 2007
@@ -148,6 +148,7 @@
</td>
</tr>
+% if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
<tr>
<td><% loc('Sign')%></td>
<td><& /Widgets/Form/Boolean:InputOnly, Name => 'Sign', CurrentValue => $ARGS{'Sign'} &></td>
@@ -155,6 +156,7 @@
<td><& /Widgets/Form/Boolean:InputOnly, Name => 'Encrypt', CurrentValue => $ARGS{'Encrypt'} &></td>
<td colspan="2"> </td>
</tr>
+% }
<tr>
<td colspan="6">
@@ -258,12 +260,14 @@
ARGSRef => \%ARGS
);
-foreach ( qw(Sign Encrypt) ) {
- $ARGS{ $_ } = $m->comp( '/Widgets/Form/Boolean:Process',
- Name => $_,
- DefaultValue => $QueueObj->$_,
- Arguments => \%ARGS,
- );
+if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
+ foreach ( qw(Sign Encrypt) ) {
+ $ARGS{ $_ } = $m->comp( '/Widgets/Form/Boolean:Process',
+ Name => $_,
+ DefaultValue => $QueueObj->$_,
+ Arguments => \%ARGS,
+ );
+ }
}
# if no due date has been set explicitly, then use the
Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html (original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Update.html Sat Apr 28 19:59:56 2007
@@ -110,12 +110,14 @@
<tr><td align="right"><&|/l&>Attach</&>:</td><td><input name="Attach" type="file" /><input type="submit" class="button" name="AddMoreAttach" value="<&|/l&>Add More Files</&>" /><input type="hidden" class="hidden" name="UpdateAttach" value="1" />
</td></tr>
+% if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
<tr><td> </td><td><table>
<td><% loc('Sign')%></td>
<td><& /Widgets/Form/Boolean:InputOnly, Name => 'Sign', CurrentValue => $ARGS{'Sign'} &></td>
<td><% loc('Encrypt')%></td>
<td><& /Widgets/Form/Boolean:InputOnly, Name => 'Encrypt', CurrentValue => $ARGS{'Encrypt'} &></td>
</table></td></tr>
+% }
<tr><td align="right" valign="top"><&|/l&>Message</&>:</td><td>
% $m->callback( %ARGS, CallbackName => 'BeforeMessageBox' );
@@ -160,12 +162,14 @@
$title = loc("Update ticket #[_1] ([_2])", $TicketObj->id, $TicketObj->Subject);
}
-foreach ( qw(Sign Encrypt) ) {
- $ARGS{ $_ } = $m->comp( '/Widgets/Form/Boolean:Process',
- Name => $_,
- DefaultValue => $TicketObj->QueueObj->$_,
- Arguments => \%ARGS,
- );
+if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
+ foreach ( qw(Sign Encrypt) ) {
+ $ARGS{ $_ } = $m->comp( '/Widgets/Form/Boolean:Process',
+ Name => $_,
+ DefaultValue => $TicketObj->QueueObj->$_,
+ Arguments => \%ARGS,
+ );
+ }
}
# Things needed in the template - we'll do the processing here, just
More information about the Rt-commit
mailing list