[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.10-215-g27102d8

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  27102d826990cfe49568efb2074575afe6c5862c (commit)
       via  1e06f8f36f377fbdca4f93a8291d1d50d0990e97 (commit)
       via  0bbc00e98b6f58c6f7492924a3ff864877b3e587 (commit)
       via  238829051bd0d588a3fdf63d5a44af964e4602d8 (commit)
       via  15139b453a3792ecca2989b800b72cfc26a88879 (commit)
       via  060e3207b3a086447ece394fc5500428bb3e946b (commit)
       via  0a4af10514783e299ef8364cc73d882cbe713693 (commit)
       via  a09e210eddaf9975855a48caa6d7e732313ad836 (commit)
       via  01109928aec92630d1cd5751a0842956b59a40d4 (commit)
       via  dda8fc212805551472e6224558b913917fa2c1b4 (commit)
       via  86f86553a9a01a9a83ca149ff5458802ccd030a9 (commit)
       via  32db3d38982d232a9813da425eb401a6d4e33795 (commit)
       via  1ec81f1919e9efc5386a43144a14ab63c456c302 (commit)
       via  cc58a52902c1fad8e1caad0498cfa9acc58e4010 (commit)
       via  e529e4d55571dd352b79c345e8ce30da65a0d860 (commit)
       via  b86119f3bf8ae18ab0caf50828326487fa736d02 (commit)
       via  ab2df9495b12530246f16bb38519e0f863318532 (commit)
       via  1d78f714d7e029c14924aa9c18f92d0de987ec27 (commit)
      from  58c01f00dde5562475bd49f5db443084ffe8d468 (commit)

Summary of changes:
 lib/RT/Attachment.pm                |  15 ++---
 lib/RT/Attribute.pm                 |   9 +--
 lib/RT/Transaction.pm               |   4 ++
 sbin/rt-test-dependencies.in        |  30 +++++++++-
 share/html/Elements/EditTimeValue   |  12 ++--
 share/html/Elements/SelectTimeUnits |   6 +-
 share/html/Ticket/Create.html       |   6 +-
 share/html/Ticket/Update.html       |   1 -
 share/html/m/ticket/create          |   3 -
 share/html/m/ticket/reply           |   1 -
 t/web/ticket_preserve_basics.t      | 110 ++++++++++++++++++++++++++++++++++++
 11 files changed, 164 insertions(+), 33 deletions(-)
 create mode 100644 t/web/ticket_preserve_basics.t

- Log -----------------------------------------------------------------
commit 27102d826990cfe49568efb2074575afe6c5862c
Merge: 58c01f0 1e06f8f
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Mar 18 17:19:16 2015 -0400

    Merge branch '4.0-trunk' into 4.2-trunk

diff --cc lib/RT/Transaction.pm
index 79043ce,f2a88f1..d909171
--- a/lib/RT/Transaction.pm
+++ b/lib/RT/Transaction.pm
@@@ -1362,9 -1159,28 +1364,11 @@@ It always returns true if current user 
  sub CurrentUserCanSee {
      my $self = shift;
  
+     return 1 if $self->CurrentUser->PrincipalObj->Id == RT->SystemUser->Id;
+ 
 -    # If it's a comment, we need to be extra special careful
 -    my $type = $self->__Value('Type');
 -    if ( $type eq 'Comment' ) {
 -        unless ( $self->CurrentUserHasRight('ShowTicketComments') ) {
 -            return 0;
 -        }
 -    }
 -    elsif ( $type eq 'CommentEmailRecord' ) {
 -        unless ( $self->CurrentUserHasRight('ShowTicketComments')
 -            && $self->CurrentUserHasRight('ShowOutgoingEmail') ) {
 -            return 0;
 -        }
 -    }
 -    elsif ( $type eq 'EmailRecord' ) {
 -        unless ( $self->CurrentUserHasRight('ShowOutgoingEmail') ) {
 -            return 0;
 -        }
 -    }
      # Make sure the user can see the custom field before showing that it changed
 -    elsif ( $type eq 'CustomField' and my $cf_id = $self->__Value('Field') ) {
 +    my $type = $self->__Value('Type');
 +    if ( $type eq 'CustomField' and my $cf_id = $self->__Value('Field') ) {
          my $cf = RT::CustomField->new( $self->CurrentUser );
          $cf->SetContextObject( $self->Object );
          $cf->Load( $cf_id );
diff --cc sbin/rt-test-dependencies.in
index f8c7188,1413509..363177b
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@@ -76,9 -79,13 +76,10 @@@ GetOptions
      'with-GD',
      'with-DASHBOARDS',
      'with-USERLOGO',
 -    'with-SSL-MAILGATE',
      'with-HTML-DOC',
  
 -    'download=s',
 -    'repository=s',
      'list-deps',
+     'siteinstall!',
      'help|h',
  );
  
@@@ -184,24 -190,9 +185,24 @@@ sub set_dep 
  }
  
  $deps{'CORE'} = [ text_to_hash( << '.') ];
 +Apache::Session 1.53
 +CGI 3.38
 +CGI::Cookie 1.20
 +CGI::Emulate::PSGI
 +CGI::PSGI 0.12
- Class::Accessor 0.34
+ Class::Accessor::Fast
 +Crypt::Eksblowfish
 +CSS::Squish 0.06
 +Data::GUID
 +Date::Extract 0.02
 +Date::Manip
  DateTime 0.44
 +DateTime::Format::Natural 0.67
  DateTime::Locale 0.40
 +DBI 1.37
 +DBIx::SearchBuilder 1.65
 +Devel::GlobalDestruction
 +Devel::StackTrace 1.19
  Digest::base
  Digest::MD5 2.27
  Digest::SHA

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