[Rt-commit] rt branch, master, updated. rt-4.1.8-226-g5f05aee

[Alex Vandiver]

The branch, master has been updated
       via  5f05aeed0ab81a7db1dbd31f2731435283a302d8 (commit)
       via  51d20ba6a1844c58dc4019f18a981ef5a0cebe41 (commit)
       via  6d58576fedd92d90e68d687b9d1b8011dc8b6004 (commit)
       via  af674916f5c4f28c81c0bba1c0d662cf6370e7cd (commit)
       via  1effc562ee1affccf0b35a9c2a3ea8b85d3ce619 (commit)
       via  457ddefa23270e75e81c6eaf87a704298296a912 (commit)
       via  c80785470fd0fb234565a0bfff675a840696f02c (commit)
       via  c95aa6090301b49c29d56619b643d98736a1b20d (commit)
       via  14aab28481043f9eafc9282399f57257f3b8b6f3 (commit)
      from  f94ef5b7305c9fe784a1d991bb20b5ae2b776704 (commit)

Summary of changes:
 lib/RT/Interface/Web.pm                   |  87 +++--
 lib/RT/Test.pm                            |   5 +-
 share/html/Search/Bulk.html               |  15 +-
 share/html/SelfService/Create.html        |   3 +-
 share/html/SelfService/Display.html       |  83 ++---
 share/html/SelfService/Update.html        |   3 +-
 share/html/Ticket/Create.html             |   1 +
 share/html/Ticket/Display.html            |  12 +-
 share/html/Ticket/Elements/AddAttachments |  17 +-
 share/html/Ticket/ModifyAll.html          |   7 +-
 share/html/Ticket/Update.html             |   2 +-
 share/html/m/ticket/create                |   9 +-
 share/html/m/ticket/reply                 |   1 +
 share/html/m/ticket/show                  |   7 +-
 t/web/attachments.t                       | 579 +++++++++++++++++++++++++-----
 15 files changed, 610 insertions(+), 221 deletions(-)

- Log -----------------------------------------------------------------
commit 5f05aeed0ab81a7db1dbd31f2731435283a302d8
Merge: f94ef5b 51d20ba
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri May 3 15:20:26 2013 -0400

    Merge branch '4.2/web-attachs-processing'
    
    Conflicts:
    	share/html/Ticket/Update.html

diff --cc share/html/Ticket/Update.html
index 90789b0,7125bad..23ea378
--- a/share/html/Ticket/Update.html
+++ b/share/html/Ticket/Update.html
@@@ -56,7 -56,8 +56,8 @@@
  % $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS, Ticket => $TicketObj, CanRespond => $CanRespond, CanComment => $CanComment, ResponseDefault => $ResponseDefault, CommentDefault => $CommentDefault );
  <input type="hidden" class="hidden" name="QuoteTransaction" value="<% $ARGS{QuoteTransaction}||'' %>" />
  <input type="hidden" class="hidden" name="DefaultStatus" value="<% $DefaultStatus ||''%>" />
 -<input type="hidden" class="hidden" name="Action" value="<% $ARGS{Action}||'' %>" />
 +<input type="hidden" class="hidden" name="Action" value="<% $Action %>" />
+ <input type="hidden" class="hidden" name="Token" value="<% $ARGS{'Token'} %>" />
  
  <& /Elements/GnuPG/SignEncryptWidget:ShowIssues, self => $gnupg_widget &>
  

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