[Rt-commit] rt branch, 4.6/core-group-management-extensions, repushed

[Blaine Motsinger]

The branch 4.6/core-group-management-extensions was deleted and repushed:
       was ee574363a47a19fae0169a757daa6d2754fe3358
       now 0e08d7ee7c4f692deca133c5a323f393fd9074fd

1: daf81d1be = 1: daf81d1be Core RT-Extension-GroupLinks
2: 0ff9b75cb ! 2: f36b4386f Core RT-Extension-GroupSummary
    @@ -1218,8 +1218,8 @@
        <input type="hidden" class="hidden" name="Token" value="<% $ARGS{'Token'} %>" />
     -  
     +
    -+% if ( $ARGSRef->{'AddGroupCc'} ){
    -+<input type="hidden" class="hidden" name="AddGroupCc" value="<% $ARGSRef->{'AddGroupCc'} %>" />
    ++% if ( $ARGS{'AddGroupCc'} ){
    ++<input type="hidden" class="hidden" name="AddGroupCc" value="<% $ARGS{'AddGroupCc'} %>" />
     +% }
     +
      % $m->callback( CallbackName => 'FormStart', QueueObj => $QueueObj, ARGSRef => \%ARGS );
    @@ -1229,35 +1229,27 @@
      $MemberOf => undef
      $QuoteTransaction => undef
      $CloneTicket => undef
    -+$ARGSRef => undef
    ++$AddGroupCc => undef
      </%ARGS>
     
     diff --git a/share/html/Ticket/Display.html b/share/html/Ticket/Display.html
     --- a/share/html/Ticket/Display.html
     +++ b/share/html/Ticket/Display.html
     @@
    - $ShowHeaders => 0
    - $HideUnsetFields => RT->Config->Get('HideUnsetFieldsOnDisplay', $session{CurrentUser})
    - $ForceShowHistory => 0
    -+$ARGSRef => undef
    - </%ARGS>
    - 
    - <%INIT>
    -@@
      
      $title = loc("#[_1]: [_2]", $TicketObj->Id, $TicketObj->Subject || '');
      
     +if ( $ARGS{'id'} and $ARGS{'id'} eq 'new' ) {
    -+    if ( $ARGSRef->{'AddGroupCc'} ){
    ++    if ( $ARGS{'AddGroupCc'} ){
     +        my $group = RT::Group->new($session{'CurrentUser'});
    -+        my ($ret, $msg) = $group->LoadUserDefinedGroup($ARGSRef->{'AddGroupCc'});
    ++        my ($ret, $msg) = $group->LoadUserDefinedGroup($ARGS{'AddGroupCc'});
     +
     +        unless ( $ret ){
    -+            RT::Logger->warn("Unable to load group " . $ARGSRef->{'AddGroupCc'} . ", $msg. Not adding as Cc.");
    ++            RT::Logger->warn("Unable to load group " . $ARGS{'AddGroupCc'} . ", $msg. Not adding as Cc.");
     +            return;
     +        }
     +
    -+        ( $ret, $msg ) = $$TicketObj->AddWatcher(
    ++        ( $ret, $msg ) = $TicketObj->AddWatcher(
     +            Type        => 'Cc',
     +            PrincipalId => $group->Id
     +        );
3: c81b45166 = 3: 6247edea9 Core RT-Extension-GroupSelfService
4: 154790067 = 4: 1c06b1eaa Add note to UPGRADING-4.6 for callback changes
5: ee574363a = 5: 0e08d7ee7 Remove hardcoded custom field values in tests