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

[Shawn Moore]

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

1:  26806b4 ! 1:  8c4cc5f Show the Ticket's Subject when modifying the ticket.
    @@ -7,6 +7,9 @@
         
         Fix up the reminders tests that look at the entire ticket title on the
         Modify page.
    +    
    +    Fixes Ticket/Update.html to have formatting consistent with the rest of
    +    the pages.
     
     diff --git a/share/html/Ticket/Forward.html b/share/html/Ticket/Forward.html
     --- a/share/html/Ticket/Forward.html
    @@ -22,6 +25,30 @@
      
      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
    ++++ b/share/html/Ticket/History.html
    +@@
    + %# those contributions and any derivatives thereof.
    + %#
    + %# END BPS TAGGED BLOCK }}}
    +-<& /Elements/Header, Title => loc("Ticket History # [_1] [_2]", $Ticket->Id, $Ticket->Subject) &>
    ++<& /Elements/Header, Title => loc("Ticket History #[_1]: [_2]", $Ticket->Id, $Ticket->Subject) &>
    + <& /Elements/Tabs &>
    + 
    + % $m->callback( %ARGS, Ticket => $Ticket, CallbackName => 'BeforeActionList' );
     
     diff --git a/share/html/Ticket/Modify.html b/share/html/Ticket/Modify.html
     --- a/share/html/Ticket/Modify.html
    @@ -88,6 +115,19 @@
          
      % $m->callback(CallbackName => 'BeforeActionList', ARGSRef => \%ARGS, Ticket => $Ticket);
     
    +diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
    +--- a/share/html/Ticket/Update.html
    ++++ b/share/html/Ticket/Update.html
    +@@
    +     $DefaultStatus=($ARGS{'Status'} ||$TicketObj->Status());
    + }
    + 
    +-my $title = loc("Update ticket #[_1] ([_2])", $TicketObj->id, $TicketObj->Subject||'');
    ++my $title = loc("Update ticket #[_1]: [_2]", $TicketObj->id, $TicketObj->Subject);
    + 
    + # Things needed in the template - we'll do the processing here, just
    + # for the convenience:
    +
     diff --git a/t/web/reminder-permissions.t b/t/web/reminder-permissions.t
     --- a/t/web/reminder-permissions.t
     +++ b/t/web/reminder-permissions.t