Merge branch '5.0/exclude-owner-from-one-time-inputs' into 5.0-trunk

Author: cbrandtbuffalo

share/html/Ticket/Elements/UpdateCc

@@ -177,6 +177,9 @@ my %txn_addresses = %{$TicketObj->TransactionAddresses};
 my @people_addresses = Email::Address->parse( $TicketObj->RequestorAddresses );
 push @people_addresses, Email::Address->parse( $TicketObj->CcAddresses );
 push @people_addresses, Email::Address->parse( $TicketObj->AdminCcAddresses );
+if ( my $owner_email = $TicketObj->OwnerObj->EmailAddress ) {
+    push @people_addresses, Email::Address->parse( $owner_email );
+}
 
 my @one_time_Ccs;
 

t/web/ticket_role_input.t

@@ -18,6 +18,7 @@ ok( $root->Load( 'root' ), 'load root user' );
 
 my $alice = RT::Test->load_or_create_user( Name => 'alice', EmailAddress => 'alice@example.com' );
 ok( $alice->id, 'created user alice' );
+ok( $alice->PrincipalObj->GrantRight( Object => RT->System, Right => 'OwnTicket' ) );
 
 my $bob = RT::Test->load_or_create_user( Name => 'bob', EmailAddress => 'bob@example.com' );
 ok( $bob->id, 'created user bob' );
@@ -129,6 +130,47 @@ diag "Test ticket update page";
     $m->content_contains( 'BCC: richard@example.com' );
 }
 
+diag "Test checkboxes for One-time Cc/Bcc on ticket update page";
+{
+
+    my $ticket = RT::Test->create_ticket(
+        Queue      => $queue,
+        Subject    => 'test inputs on update',
+        Content    => 'test content',
+        Requestor  => 'foo@example.com',
+        Cc         => 'richard@example.com',
+        AdminCc    => 'bob',
+    );
+    $m->goto_ticket( $ticket->id, 'Update' );
+    is( $m->dom->find('.ticket-update-suggested-cc input')->size, 0, 'No one-time checkboxes' );
+
+    $m->submit_form_ok(
+        {
+            form_name => 'TicketUpdate',
+            fields    => {
+                UpdateContent => 'test content',
+                UpdateCc      => 'alice@example.com, foo@example.com',
+                UpdateBcc      => 'richard@example.com, bob@example.com',
+            },
+            button => 'SubmitTicket',
+        },
+        'submit form TicketUpdate'
+    );
+    $m->content_contains('Comments added');
+
+    $m->goto_ticket( $ticket->id, 'Update' );
+
+    is( $m->dom->find('.ticket-update-suggested-cc input')->size, 2, 'Two one-time checkboxes' );
+    ok( $m->dom->at('.ticket-update-suggested-cc input[name="UpdateCc-alice@example.com"]'),
+        'One-time Cc checkbox for alice@example.com' );
+    ok( $m->dom->at('.ticket-update-suggested-cc input[name="UpdateBcc-alice@example.com"]'),
+        'One-time Bcc checkbox for alice@example.com' );
+
+    ok( $ticket->SetOwner( $alice->Id ) );
+    $m->goto_ticket( $ticket->id, 'Update' );
+    is( $m->dom->find('.ticket-update-suggested-cc input')->size, 0, 'No one-time checkboxes' );
+}
+
 diag "Test ticket bulk update page";
 {