[Rt-commit] rt branch, 4.2/further-group-type-name-renames, created. rt-4.1.8-486-gdf00c13

[Alex Vandiver]

The branch, 4.2/further-group-type-name-renames has been created
        at  df00c13d5448764acf1a89760d9ae9fd7d8469ee (commit)

- Log -----------------------------------------------------------------
commit df00c13d5448764acf1a89760d9ae9fd7d8469ee
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue May 28 12:09:32 2013 -0400

    Fix a few more Type → Name renames missed by 71fcde3

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index e82d885..69a1209 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -3532,7 +3532,7 @@ sub GetPrincipalsMap {
         if (/System/) {
             my $system = RT::Groups->new($session{'CurrentUser'});
             $system->LimitToSystemInternalGroups();
-            $system->OrderBy( FIELD => 'Type', ORDER => 'ASC' );
+            $system->OrderBy( FIELD => 'Name', ORDER => 'ASC' );
             push @map, [
                 'System' => $system,    # loc_left_pair
                 'Name'   => 1,
@@ -3575,7 +3575,7 @@ sub GetPrincipalsMap {
             }
 
             if ($roles) {
-                $roles->OrderBy( FIELD => 'Type', ORDER => 'ASC' );
+                $roles->OrderBy( FIELD => 'Name', ORDER => 'ASC' );
                 push @map, [
                     'Roles' => $roles,  # loc_left_pair
                     'Name'  => 1
diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index d23e8d3..858f62f 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -996,7 +996,7 @@ sub _WatcherMembershipLimit {
     if ($type) {
         $self->Limit(
             ALIAS           => $groups,
-            FIELD           => 'Type',
+            FIELD           => 'Name',
             VALUE           => $type,
             ENTRYAGGREGATOR => 'AND'
         );
diff --git a/lib/RT/User.pm b/lib/RT/User.pm
index 5391184..e5f1538 100644
--- a/lib/RT/User.pm
+++ b/lib/RT/User.pm
@@ -1461,7 +1461,7 @@ sub WatchedQueues {
         $watched_queues->Limit(
                                 SUBCLAUSE => 'LimitToWatchers',
                                 ALIAS => $group_alias,
-                                FIELD => 'Type',
+                                FIELD => 'Name',
                                 VALUE => 'Cc',
                                 ENTRYAGGREGATOR => 'OR',
                               );
@@ -1470,7 +1470,7 @@ sub WatchedQueues {
         $watched_queues->Limit(
                                 SUBCLAUSE => 'LimitToWatchers',
                                 ALIAS => $group_alias,
-                                FIELD => 'Type',
+                                FIELD => 'Name',
                                 VALUE => 'AdminCc',
                                 ENTRYAGGREGATOR => 'OR',
                               );

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