X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FAdmin%2FQueues%2FModify.html;h=202950e6f4ece9bb72f5c74f8901737193b54b5e;hp=c2cf09422fc0cedafdf3c4a66fd8170dec16357b;hb=7322f2afedcc2f427e997d1535a503613a83f088;hpb=96783bdc58be6e4f2fc56d516a9ceba57af00ba8 diff --git a/rt/share/html/Admin/Queues/Modify.html b/rt/share/html/Admin/Queues/Modify.html index c2cf09422..202950e6f 100755 --- a/rt/share/html/Admin/Queues/Modify.html +++ b/rt/share/html/Admin/Queues/Modify.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -52,26 +52,33 @@
- - +% $m->callback( CallbackName => 'FormStart', Create => $Create, ARGSRef => \%ARGS ); - - - + - - - +&> +% } + @@ -104,38 +111,40 @@ % my $CFs = $QueueObj->CustomFields; % while (my $CF = $CFs->Next) { % } -% if ( RT->Config->Get('GnuPG')->{'Enable'} ) { - - - - +% if ( RT->Config->Get('Crypt')->{'Enable'} ) { + + + + - - + + % } - - + +% } -% if ( RT->Config->Get('GnuPG')->{'Enable'} ) { +% if ( RT->Config->Get('Crypt')->{'Enable'} ) { @@ -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') &> -<&|/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. +<&|/Widgets/TitleBox, title => loc( 'Private keys') &> +<&|/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. %} @@ -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( @@ -199,10 +210,9 @@ if ( $QueueObj->Id ) { ARGSRef => \%ARGS, ); - $ARGS{'Lifecycle'} = undef if defined $ARGS{'Lifecycle'} and $ARGS{'Lifecycle'} eq "default"; push @results, UpdateRecordObject( AttributesRef => \@attribs, - Object => $QueueObj, + Object => $QueueObj, ARGSRef => \%ARGS ); @@ -230,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, @@ -252,5 +264,6 @@ $InitialPriority => undef $FinalPriority => undef $DefaultDueIn => undef $SetEnabled => undef +$SetCrypt => undef $Enabled => undef
<&|/l&>Queue Name:Name || $Name %>" />
<&|/l&>Queue Name: +% if ($InternalQueue) { +<% $QueueObj->Name %> +% } else { +Name || $Name %>" /> +% } +
<&|/l&>Description: Description || $Description || '' %>" size="60" />
<&|/l&>Lifecycle:<& /Widgets/Form/Select:InputOnly, +
<&|/l&>Lifecycle: +% 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, -&>
<&|/l&>Subject Tag: SubjectTag || '' ) %>" size="60" />
-<% loc($CF->Name) %>: +<% $CF->Name %>: -<& /Elements/EditCustomField, CustomField => $CF, - Object => $QueueObj, - ($Create ? (NamePrefix => 'Object-RT::Queue--CustomField-') - : () )&> +<& /Elements/EditCustomField, CustomField => $CF, + Object => $QueueObj, &>
Sign? 'checked="checked"': '' |n%> /><&|/l&>Sign by defaultEncrypt? 'checked="checked"': '' |n%> /><&|/l&>Encrypt by default
Sign? 'checked="checked"': '' |n%> />Encrypt? 'checked="checked"': '' |n%> />
SignAuto? 'checked="checked"': '' |n%> /><&|/l_unsafe, "","","",""&>Sign all auto-generated mail. [_1]Caution[_2]: Enabling this option alters the signature from providing [_3]authentication[_4] to providing [_3]integrity[_4].
SignAuto? 'checked="checked"': '' |n%> />
/><&|/l&>Enabled (Unchecking this box disables this queue)
+% unless ($InternalQueue) { +
/>
+ % $m->callback( %ARGS, QueueObj => $QueueObj, results => \@results );
+ % if ( my $email = $QueueObj->CorrespondAddress || RT->Config->Get('CorrespondAddress') ) { <& /Admin/Elements/ShowKeyInfo, Type => 'private', EmailAddress => $email &> % } else { -<&|/Widgets/TitleBox, title => loc( 'GnuPG private keys') &> -<&|/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. +<&|/Widgets/TitleBox, title => loc( 'Private keys') &> +<&|/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. % }