# BEGIN BPS TAGGED BLOCK {{{
-#
+#
# COPYRIGHT:
-#
-# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC
-# <jesse@bestpractical.com>
-#
+#
+# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
+# <sales@bestpractical.com>
+#
# (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., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 or visit their web page on the internet at
-# http://www.gnu.org/copyleft/gpl.html.
-#
-#
+# 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
# 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 }}}
+
package RT::CachedGroupMember;
use strict;
}
}
+ return $id if $args{'Member'}->id == $args{'Group'}->id;
+
if ( $args{'Member'}->IsGroup() ) {
my $GroupMembers = $args{'Member'}->Object->MembersObj();
while ( my $member = $GroupMembers->Next() ) {
# 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
my $val = shift;
# if it's already disabled, we're good.
- return {1} if ($self->__Value('Disabled') == $val);
+ return (1) if ( $self->__Value('Disabled') == $val);
my $err = $self->SUPER::SetDisabled($val);
my ($retval, $msg) = $err->as_array();
unless ($retval) {
# 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 );