X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Flib%2FRT%2FCachedGroupMember_Overlay.pm;h=15f6bd73d2394b1a51c8f2704870642d0268194c;hp=f2dc86f0d295eb969075a5bca0a7e81a407bd128;hb=9c68254528b6f2c7d8c1921b452fa56064783782;hpb=945721f48f74d5cfffef7c7cf3a3d6bc2521f5dd

diff --git a/rt/lib/RT/CachedGroupMember_Overlay.pm b/rt/lib/RT/CachedGroupMember_Overlay.pm
index f2dc86f0d..15f6bd73d 100644
--- a/rt/lib/RT/CachedGroupMember_Overlay.pm
+++ b/rt/lib/RT/CachedGroupMember_Overlay.pm
@@ -1,8 +1,14 @@
-# BEGIN LICENSE BLOCK
+# BEGIN BPS TAGGED BLOCK {{{
 # 
-# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# COPYRIGHT:
+#  
+# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+#                                          <jesse@bestpractical.com>
 # 
-# (Except where explictly superceded by other copyright notices)
+# (Except where explicitly superseded by other copyright notices)
+# 
+# 
+# LICENSE:
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
@@ -14,35 +20,67 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 # 
-# Unless otherwise specified, all modifications, corrections or
-# extensions to this work which alter its source code become the
-# property of Best Practical Solutions, LLC when submitted for
-# inclusion in the work.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# 
+# 
+# CONTRIBUTION SUBMISSION POLICY:
+# 
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
 # 
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
 # 
-# END LICENSE BLOCK
+# END BPS TAGGED BLOCK }}}
+package RT::CachedGroupMember;
+
 use strict;
 no warnings qw(redefine);
 
-# {{{ Create
+=head1 NAME
+
+  RT::CachedGroupMember
+
+=head1 SYNOPSIS
+
+  use RT::CachedGroupMember;
 
-=item Create PARAMHASH
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=cut
+
+# {{ Create
+
+=head2 Create PARAMHASH
 
 Create takes a hash of values and creates a row in the database:
 
-  'Group' is the "top level" group we're building the cache for. This is an 
-  RT::Principal object
+  'Group' is the "top level" group we're building the cache for. This 
+  is an RT::Principal object
 
-  'Member' is the RT::Principal  of the user or group we're adding
-  to the cache.
+  'Member' is the RT::Principal  of the user or group we're adding to 
+  the cache.
 
-  'ImmediateParent' is the RT::Principal of the group that this principal
-  belongs to to get here
+  'ImmediateParent' is the RT::Principal of the group that this 
+  principal belongs to to get here
 
   int(11) 'Via' is an internal reference to CachedGroupMembers->Id of
-  the "parent" record of this cached group member. It should be empty if this
-  member is a "direct" member of this group. (In that case, it will be set to this 
-  cached group member's id after creation)
+  the "parent" record of this cached group member. It should be empty if 
+  this member is a "direct" member of this group. (In that case, it will 
+  be set to this cached group member's id after creation)
 
   This routine should _only_ be called by GroupMember->Create
 
@@ -88,7 +126,7 @@ sub Create {
                               Via               => $args{'Via'}, );
 
     unless ($id) {
-        $RT::Logger->warn( "Couldn't create "
+        $RT::Logger->warning( "Couldn't create "
                            . $args{'Member'}
                            . " as a cached member of "
                            . $args{'Group'}->Id . " via "
@@ -98,7 +136,7 @@ sub Create {
     if ( $self->__Value('Via') == 0 ) {
         my ( $vid, $vmsg ) = $self->__Set( Field => 'Via', Value => $id );
         unless ($vid) {
-            $RT::Logger->warn( "Due to a via error, couldn't create "
+            $RT::Logger->warning( "Due to a via error, couldn't create "
                                . $args{'Member'}
                                . " as a cached member of "
                                . $args{'Group'}->Id . " via "
@@ -218,11 +256,14 @@ mysql supported foreign keys with cascading SetDisableds.
 sub SetDisabled {
     my $self = shift;
     my $val = shift;
-    
+ 
+    # if it's already disabled, we're good.
+    return {1} if ($self->__Value('Disabled') == $val);
     my $err = $self->SUPER::SetDisabled($val);
-    unless ($err) {
-        $RT::Logger->error( "Couldn't SetDisabled CachedGroupMember " . $self->Id );
-        return (undef);
+    my ($retval, $msg) = $err->as_array();
+    unless ($retval) {
+        $RT::Logger->error( "Couldn't SetDisabled CachedGroupMember " . $self->Id .": $msg");
+        return ($err);
     }
     
     my $member = $self->MemberObj();
@@ -236,7 +277,7 @@ sub SetDisabled {
             my $kid_err = $kid->SetDisabled($val );
             unless ($kid_err) {
                 $RT::Logger->error( "Couldn't SetDisabled CachedGroupMember " . $kid->Id );
-                return (undef);
+                return ($kid_err);
             }
         }
     }