[Rt-commit] r15679 - in rt/branches/3.999-DANGEROUS/lib/RT: Model

[ruz at bestpractical.com]

Author: ruz
Date: Sun Aug 31 21:47:12 2008
New Revision: 15679

Modified:
   rt/branches/3.999-DANGEROUS/lib/RT/Model/CachedGroupMember.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupMember.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Shredder/GroupMember.pm

Log:
* s/immediate_parent_id/immediate_parent/g

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/CachedGroupMember.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/CachedGroupMember.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/CachedGroupMember.pm	Sun Aug 31 21:47:12 2008
@@ -59,7 +59,7 @@
     column member_id           => references RT::Model::Principal,
         is mandatory;
     column via                 => references RT::Model::CachedGroupMember;
-    column immediate_parent_id => references RT::Model::CachedGroupMember;
+    column immediate_parent    => references RT::Model::CachedGroupMember;
     column disabled            => type is 'integer', is mandatory, default is '0';
 
 };
@@ -144,7 +144,7 @@
     my $id = $self->SUPER::create(
         group_id            => $args{'group'}->id,
         member_id           => $args{'member'}->id,
-        immediate_parent_id => $args{'immediate_parent'}->id,
+        immediate_parent    => $args{'immediate_parent'},
         disabled            => $args{'disabled'},
         via                 => $args{'via'},
     );
@@ -369,7 +369,7 @@
 sub immediate_parent_obj {
     my $self      = shift;
     my $principal = RT::Model::Principal->new;
-    $principal->load( $self->immediate_parent_id );
+    $principal->load( $self->immediate_parent );
     return ($principal);
 }
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm	Sun Aug 31 21:47:12 2008
@@ -678,7 +678,7 @@
     my $cached_submembers = RT::Model::CachedGroupMemberCollection->new;
 
     $cached_submembers->limit(
-        column   => 'immediate_parent_id',
+        column   => 'immediate_parent',
         operator => '=',
         value    => $self->id
     );

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupMember.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupMember.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/GroupMember.pm	Sun Aug 31 21:47:12 2008
@@ -300,7 +300,7 @@
     );
 
     $cached_submembers->limit(
-        column   => 'immediate_parent_id',
+        column   => 'immediate_parent',
         operator => '=',
         value    => $self->group_obj->id
     );

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Shredder/GroupMember.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Shredder/GroupMember.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Shredder/GroupMember.pm	Sun Aug 31 21:47:12 2008
@@ -71,7 +71,7 @@
 
     my $objs = RT::Model::CachedGroupMemberCollection->new;
     $objs->limit( column => 'member_id',           value => $self->member_id );
-    $objs->limit( column => 'immediate_parent_id', value => $self->group_id );
+    $objs->limit( column => 'immediate_parent', value => $self->group_id );
     push( @$list, $objs );
 
     # XXX: right delegations should be cleaned here