projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
option to include resolved tickets in search, RT#11658
[freeside.git]
/
rt
/
lib
/
RT
/
CachedGroupMember_Overlay.pm
diff --git
a/rt/lib/RT/CachedGroupMember_Overlay.pm
b/rt/lib/RT/CachedGroupMember_Overlay.pm
index
1294af4
..
a292afb
100644
(file)
--- a/
rt/lib/RT/CachedGroupMember_Overlay.pm
+++ b/
rt/lib/RT/CachedGroupMember_Overlay.pm
@@
-1,8
+1,8
@@
-#
{{{ BEGIN BPS TAGGED BLOCK
+#
BEGIN BPS TAGGED BLOCK {{{
#
# COPYRIGHT:
#
# COPYRIGHT:
-#
-# This software is Copyright (c) 1996-200
4 Best Practical Solutions, LLC
+#
+# This software is Copyright (c) 1996-200
9 Best Practical Solutions, LLC
# <jesse@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <jesse@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-22,7
+22,9
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# 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:
#
#
# CONTRIBUTION SUBMISSION POLICY:
@@
-42,29
+44,46
@@
# works based on those contributions, and sublicense and distribute
# those contributions and any derivatives thereof.
#
# 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);
use strict;
no warnings qw(redefine);
-# {{{ Create
+=head1 NAME
+
+ RT::CachedGroupMember
+
+=head1 SYNOPSIS
+
+ use RT::CachedGroupMember;
+
+=head1 DESCRIPTION
+
+=head1 METHODS
-=item Create PARAMHASH
+=cut
+
+# {{ Create
+
+=head2 Create PARAMHASH
Create takes a hash of values and creates a row in the database:
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
- t
o t
he 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
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
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() ) {
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 still has the member recursively $self->MemberObj
# (Since we deleted the database row above, $self no longer counts)
- unless ( $self->GroupObj->Object->HasMemberRecursively( $self->Member
Obj
) ) {
+ unless ( $self->GroupObj->Object->HasMemberRecursively( $self->Member
Id
) ) {
# Find all ACEs granted to $self->GroupId
# 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;
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);
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();
}
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 );
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 still has the member recursively $self->MemberObj
# (Since we SetDisabledd the database row above, $self no longer counts)
- unless ( $self->GroupObj->Object->HasMemberRecursively( $self->Member
Obj
) ) {
+ unless ( $self->GroupObj->Object->HasMemberRecursively( $self->Member
Id
) ) {
# Find all ACEs granted to $self->GroupId
my $acl = RT::ACL->new($RT::SystemUser);
$acl->LimitToPrincipal( Id => $self->GroupId );
# Find all ACEs granted to $self->GroupId
my $acl = RT::ACL->new($RT::SystemUser);
$acl->LimitToPrincipal( Id => $self->GroupId );