[Rt-commit] rt branch, master, updated. rt-4.1.5-241-g69e4a71

Alex Vandiver alexmv at bestpractical.com
Fri Jan 4 18:41:37 EST 2013


The branch, master has been updated
       via  69e4a71c78c81161e58e0b04e0ae16e806c69b1c (commit)
       via  4400f7dcc321afe6f8b33291bdd4015ea1029b6f (commit)
       via  e342c4c72f6cbc15d77c16f119ef13ff2425299a (commit)
       via  5275b8dc87558bf95c0ef499c78e54e58225205e (commit)
       via  f09ef3b11216411cad3c5e18d7dc0e9742d7ff0b (commit)
       via  ffea49d4f5d17a1c7dc03521479bb4ba5ea83fa6 (commit)
      from  bb12d13a21ee7ed53c2541acc88b0a43287c6c82 (commit)

Summary of changes:
 docs/UPGRADING-4.2                                 |  5 +++
 etc/RT_Config.pm.in                                | 34 ++++++++++++++---
 etc/upgrade/4.1.6/content                          | 43 ++++++++++++++++++++++
 lib/RT/Config.pm                                   | 12 ++++--
 lib/RT/Test.pm                                     |  1 +
 share/html/Ticket/Display.html                     |  9 ++++-
 share/html/Ticket/Elements/ClickToShowHistory      |  9 +++--
 .../{ClickToShowHistory => DelayShowHistory}       | 34 ++++++++++++++---
 8 files changed, 129 insertions(+), 18 deletions(-)
 create mode 100644 etc/upgrade/4.1.6/content
 copy share/html/Ticket/Elements/{ClickToShowHistory => DelayShowHistory} (69%)

- Log -----------------------------------------------------------------
commit 69e4a71c78c81161e58e0b04e0ae16e806c69b1c
Merge: bb12d13 4400f7d
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jan 4 18:33:40 2013 -0500

    Merge branch '4.2/delay-transaction-loading'
    
    Conflicts:
    	docs/UPGRADING-4.2
    	share/html/Ticket/Elements/ClickToShowHistory

diff --cc docs/UPGRADING-4.2
index 4b165ff,435f0a3..319e71a
--- a/docs/UPGRADING-4.2
+++ b/docs/UPGRADING-4.2
@@@ -11,53 -5,7 +11,58 @@@ UPGRADING FROM RT 4.0.0 and greate
    but an informational notice will be issued on server start telling you about
    the rename.  To avoid this you should set $LogToSTDERR instead.
  
 +* The link direction and type maps are consolidated into RT::Link.  If you
 +  wrote local customizations or extensions utilizing %RT::Ticket::LINKDIRMAP,
 +  %RT::Ticket::LINKTYPEMAP, RT::Ticket->LINKDIRMAP, RT::Ticket->LINKTYPEMAP, or
 +  %RT::Record::LINKDIRMAP, you will need to switch to %RT::Link::DIRMAP and
 +  %RT::Link::TYPEMAP.
 +
 +* $LinkTransactionsRun1Scrip is removed.  If you were relying on this behaviour
 +  (by setting it to 1), you should adjust your scrips to ignore one of the link
 +  transactions.
 +
 +* The $AttachmentUnits option was removed in preference of always displaying in
 +  megabytes, kilobytes, or bytes as appropriate.  The option was incompletely
 +  implemented and controlled display in the attachments list but not history.
 +
 +* MakeClicky handlers added via a callback are now passed an "object" key in
 +  the parameter hash instead of "ticket".  The object may be any RT::Record
 +  subclass.
 +
 +* $MessageBoxWrap was removed.  Wrapping is now always SOFT.  If you want hard
 +  line breaks, enter them manually.
 +
 +* ShowUser handlers (/Elements/ShowUser*) have moved out of Mason components
 +  and into RT::User methods.  Any custom username formats will need to be
 +  reimplemented as RT::User methods.  Renaming should follow that of the core
 +  components:
 +
 +        /Elements/ShowUserConcise => RT::User->_FormatUserConcise
 +        /Elements/ShowUserVerbose => RT::User->_FormatUserVerbose
 +
 +  The _FormatUser* methods are passed a hash containing the keys User and
 +  Address, which have the same properties as before.
 +
 +* Rich text (HTML) messages are now preferred for display.  If you prefer plain
 +  text messages, set $PreferRichText to 0.
 +
 +* User email addresses are now validated by default and multiple,
 +  comma-separated addresses for a single user are no longer allowed.  Existing
 +  users with invalid addresses will continue to work until the next time they
 +  are updated by an administrator on the modify user page.  If you prefer no
 +  address validation, set $ValidateUserEmailAddresses to 0.
 +
 +* The 'smtp' value for $MailCommand, along with the associated
 +  $SMTPServer, $SMTPFrom, and $SMTPDebug options, has been removed
 +  because it did not guarantee delivery.  Instead, use a local MTA for
 +  outgoing mail, via the 'sendmailpipe' setting to $MailCommand.
 +
 +* The @JSFiles config now only keeps additional JavaScript filenames; if
 +  you had copied @JSFiles to add extra entries in your RT_SiteConfig,
 +  remove the core JS from the list, or RT will serve those files
 +  multiple times.
++
+ * The $DeferTransactionLoading was combined into the new option $ShowHistory.
+   If you had enabled $DeferTransactionLoading, you may want to set $ShowHistory
+   to "click".  However, $ShowHistory provides a new mode, "delay", which is the
+   default and may be a more appealing alternative to "click".
diff --cc share/html/Ticket/Display.html
index 4526534,c251730..3ab83f6
mode 100644,100755..100644
--- a/share/html/Ticket/Display.html
+++ b/share/html/Ticket/Display.html
@@@ -64,16 -63,25 +64,23 @@@
  </div>
  <br />
  
 -% $m->callback( Ticket => $TicketObj, %ARGS, CallbackName => 'BeforeShowHistory' );
 +% $m->callback( Ticket => $TicketObj, %ARGS, Transactions => $transactions, Attachments => $attachments, CallbackName => 'BeforeShowHistory' );
  
- % if (not $ForceShowHistory and RT->Config->Get( 'DeferTransactionLoading', $session{'CurrentUser'} )) {
+ % my $ShowHistory = RT->Config->Get("ShowHistory", $session{'CurrentUser'});
+ % if (not $ForceShowHistory and $ShowHistory eq "delay") {
+     <& /Ticket/Elements/DelayShowHistory,
+         Ticket => $TicketObj,
+         ShowHeaders => $ARGS{'ShowHeaders'},
+     &>
+ % } elsif (not $ForceShowHistory and $ShowHistory eq "click") {
      <& /Ticket/Elements/ClickToShowHistory,
          Ticket => $TicketObj,
+         ShowHeaders => $ARGS{'ShowHeaders'},
      &>
  % } else {
 -    <& /Ticket/Elements/ShowHistory ,
 -          Ticket => $TicketObj,
 -          Tickets => $Tickets,
 +    <& /Elements/ShowHistory ,
 +          Object => $TicketObj,
            Transactions => $transactions,
 -          Collapsed => $ARGS{'Collapsed'},
            ShowHeaders => $ARGS{'ShowHeaders'},
            Attachments => $attachments,
            AttachmentContent => $attachment_content
diff --cc share/html/Ticket/Elements/ClickToShowHistory
index 5a9a477,4554839..a3d9271
--- a/share/html/Ticket/Elements/ClickToShowHistory
+++ b/share/html/Ticket/Elements/ClickToShowHistory
@@@ -53,8 -53,17 +53,11 @@@
  <%ARGS>
  $Ticket
  </%ARGS>
 -<%ONCE>
 -require JSON;
 -</%ONCE>
  <%INIT>
- my $id = $Ticket->id;
- my $url = RT->Config->Get('WebPath') ."/Helpers/TicketHistory?id=". $id;
- my $display = RT->Config->Get('WebPath') ."/Ticket/Display.html?id=$id;ForceShowHistory=1";
+ my %params = %ARGS;
+ delete $params{Ticket};
+ 
+ my $query   = $m->comp('/Elements/QueryString', %params, id => $Ticket->id );
 -my $url     = JSON::to_json(
 -    RT->Config->Get('WebPath')."/Helpers/TicketHistory?$query",
 -    { allow_nonref => 1 }
 -);
++my $url     = RT->Config->Get('WebPath')."/Helpers/TicketHistory?$query";
+ my $display = RT->Config->Get('WebPath')."/Ticket/Display.html?ForceShowHistory=1;$query";
  </%INIT>

-----------------------------------------------------------------------


More information about the Rt-commit mailing list