X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FCachedGroupMember_Overlay.pm;h=bc21619fed91724466c2c0e7c04c892cea5d23f3;hb=a9b978f216f2fc4845363f0b48891b53870adefb;hp=1294af4ee149acfe1b17d75504763eb56be56dde;hpb=d39d52aac8f38ea9115628039f0df5aa3ac826de;p=freeside.git diff --git a/rt/lib/RT/CachedGroupMember_Overlay.pm b/rt/lib/RT/CachedGroupMember_Overlay.pm index 1294af4ee..bc21619fe 100644 --- a/rt/lib/RT/CachedGroupMember_Overlay.pm +++ b/rt/lib/RT/CachedGroupMember_Overlay.pm @@ -1,38 +1,40 @@ -# {{{ BEGIN BPS TAGGED BLOCK -# +# BEGIN BPS TAGGED BLOCK {{{ +# # COPYRIGHT: -# -# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC -# -# +# +# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +# +# # (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 # been provided with this software, but in any event can be snarfed # from www.gnu.org. -# +# # This work is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. -# +# # 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. -# -# +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 or visit their web page on the internet at +# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. +# +# # 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 @@ -41,30 +43,47 @@ # 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 BPS TAGGED BLOCK +# +# END BPS TAGGED BLOCK }}} + +package RT::CachedGroupMember; + use strict; no warnings qw(redefine); -# {{{ Create +=head1 NAME + + RT::CachedGroupMember + +=head1 SYNOPSIS -=item Create PARAMHASH + use RT::CachedGroupMember; + +=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 @@ -130,6 +149,8 @@ sub Create { } } + return $id if $args{'Member'}->id == $args{'Group'}->id; + if ( $args{'Member'}->IsGroup() ) { my $GroupMembers = $args{'Member'}->Object->MembersObj(); while ( my $member = $GroupMembers->Next() ) { @@ -197,7 +218,7 @@ sub Delete { # Unless $self->GroupObj still has the member recursively $self->MemberObj # (Since we deleted the database row above, $self no longer counts) - unless ( $self->GroupObj->Object->HasMemberRecursively( $self->MemberObj ) ) { + unless ( $self->GroupObj->Object->HasMemberRecursively( $self->MemberId ) ) { # Find all ACEs granted to $self->GroupId @@ -240,11 +261,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(); @@ -258,14 +282,14 @@ 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); } } } # Unless $self->GroupObj still has the member recursively $self->MemberObj # (Since we SetDisabledd the database row above, $self no longer counts) - unless ( $self->GroupObj->Object->HasMemberRecursively( $self->MemberObj ) ) { + unless ( $self->GroupObj->Object->HasMemberRecursively( $self->MemberId ) ) { # Find all ACEs granted to $self->GroupId my $acl = RT::ACL->new($RT::SystemUser); $acl->LimitToPrincipal( Id => $self->GroupId );