[Rt-commit] rt branch, 4.4/forbid-merging-reminders, repushed

[Maureen Mirville]

The branch 4.4/forbid-merging-reminders was deleted and repushed:
       was c74f83245f51a4adb131c7a0fee788c925157c1c
       now 8c2ffab7059a48dce3ea46b735610a71f60fb404

1:  c3130d4 ! 1:  1d4455d Only tickets can be merged
    @@ -1,8 +1,10 @@
     Author: Maureen E. Mirville <maureen at bestpractical.com>
     
    -    Forbid merging reminders
    +    Only tickets can be merged
         
    -    Tickets can no longer merge into reminders.
    +    Each ticket has a type property. Only tickets with the type,
    +    'ticket', can be merged. For example, 'reminder' tickets
    +    cannot be merged.
         
         Fixes I#32700
     
    @@ -14,9 +16,10 @@
              return ( 0, $self->loc("Can't merge a ticket into itself") );
          }
     +    
    -+    # Cannot merge into a reminder
    -+    if ($MergeInto->Type eq 'reminder'){
    -+        return(0, "Reminders cannot be merged");
    ++    # Only tickets can be merged
    ++    unless ($MergeInto->Type eq 'ticket'){
    ++	my $id_num = $MergeInto->Id;
    ++	return(0, $self->loc("Id $id_num is not a ticket. Only tickets can be merged."));
     +    };
      
          # Make sure the current user can modify the new ticket.
2:  c74f832 < -:  ------- Tests for merging reminders
-:  ------- > 2:  8c2ffab Tests for merging tickets