[Rt-commit] rt branch, 4.2/approvals-edit, repushed

Alex Vandiver alexmv at bestpractical.com
Mon Apr 7 18:46:30 EDT 2014


The branch 4.2/approvals-edit was deleted and repushed:
       was b255897bf8f942651ac2580b89bafa9f3ce83534
       now f294fec4e684e0c176037ed5c02d49ddca1865ce

1:  1f410fb = 1:  1f410fb Hide queue name for __Approvals
2:  e02c9b4 = 2:  e02c9b4 The lifecyles drop-down does not list approvals; prevent changing away from it
3:  b255897 ! 3:  f294fec Hide the Disabled box on the Approvals queue
    @@ -10,8 +10,9 @@
         Hide the Disabled box entirely to prevent these sorts of problems.  This
         also requires moving the SetEnabled hidden form field to only display if
         Enabled was actually displayed.  The defaults for signing and encryption
    -    are moved out of the SetEnabled block, as they do not need their
    -    polarity switched; they merely establish defaults.
    +    are moved out of the SetEnabled block and inside their own SetCrypt
    +    check, as their presence on the page is now orthogonal to the Enabled
    +    checkbox.
     
     diff --git a/share/html/Admin/Queues/Modify.html b/share/html/Admin/Queues/Modify.html
     --- a/share/html/Admin/Queues/Modify.html
    @@ -38,15 +39,26 @@
      
      % 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 {
     @@
          # we're asking about enabled on the web page but really care about disabled
          if ( $SetEnabled ) {
              $Disabled = $ARGS{'Disabled'} = $Enabled? 0: 1;
    --        $ARGS{$_} = 0 foreach grep !defined $ARGS{$_} || !length $ARGS{$_},
    ++    }
    ++    if ( $SetCrypt ) {
    +         $ARGS{$_} = 0 foreach grep !defined $ARGS{$_} || !length $ARGS{$_},
     -            qw(Sign SignAuto Encrypt Disabled);
    ++            qw(Sign SignAuto Encrypt);
          }
    -+    $ARGS{$_} = 0 foreach grep !defined $ARGS{$_} || !length $ARGS{$_},
    -+        qw(Sign SignAuto Encrypt);
      
          $m->callback(
    -         CallbackName => 'BeforeUpdate',
    +@@
    + $FinalPriority => undef
    + $DefaultDueIn => undef
    + $SetEnabled => undef
    ++$SetCrypt => undef
    + $Enabled => undef
    + </%ARGS>



More information about the rt-commit mailing list