[Rt-commit] rt branch, 4.2/ticket-subject-on-modify, repushed

[Brian Duggan]

The branch 4.2/ticket-subject-on-modify was deleted and repushed:
       was 8c4cc5feba21f4e343d148d55b663793bd3ad191
       now 6cc09955f2037a42705477be58979af92a761f15

1: 8c4cc5feb ! 1: 6cc09955f Show the Ticket's Subject when modifying the ticket.
    @@ -10,6 +10,17 @@
         
         Fixes Ticket/Update.html to have formatting consistent with the rest of
         the pages.
    +
    +diff --git a/share/html/Ticket/Crypt.html b/share/html/Ticket/Crypt.html
    +--- a/share/html/Ticket/Crypt.html
    ++++ b/share/html/Ticket/Crypt.html
    +@@
    +     $encrypted = !$encrypted if $done;
    + }
    + 
    +-my $title = loc("Encrypt/Decrypt transaction #[_1] of ticket #[_2]", $id, $txn->Ticket);
    ++my $title = loc("Encrypt/Decrypt transaction #[_1] of ticket #[_2]: [_3]", $id, $txn->Ticket, $txn->TicketObj->Subject);
    + </%INIT>
     
     diff --git a/share/html/Ticket/Forward.html b/share/html/Ticket/Forward.html
     --- a/share/html/Ticket/Forward.html
    @@ -25,17 +36,6 @@
      
      my $from = RT::Interface::Email::GetForwardFrom(
          $txn ? ( Transaction => $txn ) : ( Ticket => $TicketObj ) );
    -
    -diff --git a/share/html/Ticket/GnuPG.html b/share/html/Ticket/GnuPG.html
    ---- a/share/html/Ticket/GnuPG.html
    -+++ b/share/html/Ticket/GnuPG.html
    -@@
    -     $encrypted = !$encrypted if $done;
    - }
    - 
    --my $title = loc("Encrypt/Decrypt transaction #[_1] of ticket #[_2]", $id, $txn->Ticket);
    -+my $title = loc("Encrypt/Decrypt transaction #[_1] of ticket #[_2]: [_3]", $id, $txn->Ticket, $txn->TicketObj->Subject);
    - </%INIT>
     
     diff --git a/share/html/Ticket/History.html b/share/html/Ticket/History.html
     --- a/share/html/Ticket/History.html
    @@ -70,7 +70,7 @@
      %# those contributions and any derivatives thereof.
      %#
      %# END BPS TAGGED BLOCK }}}
    --<& /Elements/Header, Title => loc('Modify dates for #[_1]', $TicketObj->Id) &>
    +-<& /Elements/Header, Title => loc('Modify dates for ticket #[_1]', $TicketObj->Id) &>
     +<& /Elements/Header, Title => loc('Modify dates for #[_1]: [_2]', $TicketObj->Id, $TicketObj->Subject) &>
      <& /Elements/Tabs &>