[Rt-commit] rt branch, 4.4/queue-include-article, repushed

[Craig Kaiser]

The branch 4.4/queue-include-article was deleted and repushed:
       was 56482566a6e58f08111cdf1ae736f4a4fc90e3ec
       now f068a4d8443a9c975e06b3eb92b992c8ad9902b8

1:  5648256 ! 1:  f068a4d Include Article on ticket create, based on queue
    @@ -118,22 +118,34 @@
      <td colspan="3"><input name="SubjectTag" value="<% $ARGS{'SubjectTag'} || ($Create ? "" : $QueueObj->SubjectTag || '' ) %>" size="60" /></td>
      </tr>
     @@
    +         $QueueObj->Load($id) || $QueueObj->Load($Name) || Abort(loc("Couldn't load queue '[_1]'", $Name));
          }
      }
    ++use Data::Printer;
    ++my $MyArticle = RT::Article->new( $session{'CurrentUser'});
    ++p($ARGS{'ArticleIncluded'});
    ++p($MyArticle->ValidateName($ARGS{'ArticleIncluded'}));
    ++if ( $MyArticle->ValidateName($ARGS{'ArticleIncluded'}) ){
    ++    $ARGS{'ArticleIncluded'} = undef;
    ++    p($ARGS{'ArticleIncluded'});
    ++}
      
    -+my $MyArticle = RT::Article->new( $session{'CurrentUser'});
      if ( $QueueObj->Id ) {
          $title = loc('Configuration for queue [_1]', $QueueObj->Name );
          my @attribs= qw(Description CorrespondAddress CommentAddress Name SortOrder
     -        Sign SignAuto Encrypt Lifecycle SubjectTag SLADisabled Disabled);
     +        Sign SignAuto Encrypt Lifecycle ArticleIncluded SubjectTag SLADisabled Disabled);
      
    -+        unless ( !$MyArticle->ValidateName($ARGS{'ArticleIncluded'}) ){
    -+        $ARGS{'ArticleIncluded'} = '';
    -+    }
          # we're asking about enabled on the web page but really care about disabled
          if ( $SetEnabled ) {
    -         $Disabled = $ARGS{'Disabled'} = $Enabled? 0: 1;
    +@@
    +         Object => $QueueObj,
    +         ARGSRef => \%ARGS
    +     );
    +-
    +     $Disabled = $ARGS{'Disabled'} = $Enabled? 0: 1;
    + 
    +     $EnabledChecked = "" if $QueueObj->Disabled;
     @@
      $CorrespondAddress => undef
      $CommentAddress => undef