projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
badly placed small_custview all of a sudden causing fatal errors?! wtf
[freeside.git]
/
rt
/
lib
/
RT
/
ACE_Overlay.pm
diff --git
a/rt/lib/RT/ACE_Overlay.pm
b/rt/lib/RT/ACE_Overlay.pm
index
75e39d0
..
54c6561
100644
(file)
--- a/
rt/lib/RT/ACE_Overlay.pm
+++ b/
rt/lib/RT/ACE_Overlay.pm
@@
-2,7
+2,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-200
5
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-200
7
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/copyleft/gpl.html.
#
#
# CONTRIBUTION SUBMISSION POLICY:
#
#
# CONTRIBUTION SUBMISSION POLICY:
@@
-43,7
+45,6
@@
# those contributions and any derivatives thereof.
#
# END BPS TAGGED BLOCK }}}
# those contributions and any derivatives thereof.
#
# END BPS TAGGED BLOCK }}}
-
=head1 SYNOPSIS
use RT::ACE;
=head1 SYNOPSIS
use RT::ACE;
@@
-814,7
+815,7
@@
sub Object {
else {
$RT::Logger->warning( "$self -> Object called for an object "
. "of an unknown type:"
else {
$RT::Logger->warning( "$self -> Object called for an object "
. "of an unknown type:"
- . $self->
ObjectType
);
+ . $self->
__Value('ObjectType')
);
return (undef);
}
}
return (undef);
}
}
@@
-916,9
+917,8
@@
sub _CanonicalizePrincipal {
my $equiv_group = RT::Group->new( $self->CurrentUser );
$equiv_group->LoadACLEquivalenceGroup($princ_obj);
unless ( $equiv_group->Id ) {
my $equiv_group = RT::Group->new( $self->CurrentUser );
$equiv_group->LoadACLEquivalenceGroup($princ_obj);
unless ( $equiv_group->Id ) {
- $RT::Logger->crit(
- "No ACL equiv group for princ " . $self->__Value('ObjectId') );
- return ( 0, $self->loc('System error. Right not granted.') );
+ $RT::Logger->crit( "No ACL equiv group for princ " . $princ_obj->id );
+ return ( RT::Principal->new($RT::SystemUser), undef );
}
$princ_obj = $equiv_group->PrincipalObj();
$princ_type = 'Group';
}
$princ_obj = $equiv_group->PrincipalObj();
$princ_type = 'Group';