[Rt-commit] rt branch, master, updated. rt-4.1.8-542-g8dd9a91

[Alex Vandiver]

The branch, master has been updated
       via  8dd9a91093a52d019d76d16854a87b8850e7ef7a (commit)
       via  20ccebd32ac630a1a503820ab58078771e378099 (commit)
       via  84c48f36741e6ee8592fab934e095e8c8386f16d (commit)
       via  4646c5ae9f12b003b00d06e50f200f06f33d5b5a (commit)
       via  06f0bfd0d2e487a53c38a236fd326bdfba17bb25 (commit)
      from  34ca5f1ba1701aa550966261ccfd113afe5f4d98 (commit)

Summary of changes:
 etc/upgrade/4.0.1/content          | 12 ++++++------
 lib/RT/Attachments.pm              | 24 ++++++++++--------------
 lib/RT/CachedGroupMembers.pm       | 15 +++++++++------
 lib/RT/GroupMembers.pm             | 14 ++++++++------
 lib/RT/Groups.pm                   | 19 ++++++++++---------
 lib/RT/Interface/Web.pm            | 11 +++++------
 lib/RT/Scrips.pm                   |  8 +++-----
 lib/RT/SearchBuilder.pm            | 12 ++++++++++++
 lib/RT/SearchBuilder/Role/Roles.pm |  1 +
 lib/RT/Transactions.pm             |  5 ++---
 lib/RT/Users.pm                    |  7 +++----
 sbin/rt-fulltext-indexer.in        |  5 -----
 12 files changed, 69 insertions(+), 64 deletions(-)

- Log -----------------------------------------------------------------
commit 8dd9a91093a52d019d76d16854a87b8850e7ef7a
Merge: 34ca5f1 20ccebd
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Jun 4 13:21:09 2013 -0400

    Merge branch '4.2/distinct-joins'

diff --cc lib/RT/Interface/Web.pm
index ea247b3,26960c8..afd725f
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@@ -3595,15 -3593,14 +3595,14 @@@ sub GetPrincipalsMap 
              );
  
              # Limit to UserEquiv groups
-             my $groups = $Users->NewAlias('Groups');
-             $Users->Join(
-                 ALIAS1 => $groups,
-                 FIELD1 => 'id',
-                 ALIAS2 => $group_members,
-                 FIELD2 => 'GroupId'
+             my $groups = $Users->Join(
+                 ALIAS1 => $group_members,
+                 FIELD1 => 'GroupId',
+                 TABLE2 => 'Groups',
+                 FIELD2 => 'id',
              );
 -            $Users->Limit( ALIAS => $groups, FIELD => 'Domain', VALUE => 'ACLEquivalence' );
 -            $Users->Limit( ALIAS => $groups, FIELD => 'Type', VALUE => 'UserEquiv' );
 +            $Users->Limit( ALIAS => $groups, FIELD => 'Domain', VALUE => 'ACLEquivalence', CASESENSITIVE => 0 );
 +            $Users->Limit( ALIAS => $groups, FIELD => 'Name', VALUE => 'UserEquiv', CASESENSITIVE => 0 );
  
              push @map, [
                  'Users' => $Users,  # loc_left_pair

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