projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update address standardization for cust_location changes
[freeside.git]
/
rt
/
share
/
html
/
Admin
/
Elements
/
SelectRights
diff --git
a/rt/share/html/Admin/Elements/SelectRights
b/rt/share/html/Admin/Elements/SelectRights
index
7ec8d1b
..
73f5bce
100755
(executable)
--- a/
rt/share/html/Admin/Elements/SelectRights
+++ b/
rt/share/html/Admin/Elements/SelectRights
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@
-95,21
+95,20
@@
while ( my $ace = $ACLObj->Next ) {
}
}
- my $ACLObj =
new RT::ACL
($session{'CurrentUser'});
- my $ACE =
new RT::ACE
($session{'CurrentUser'});
+ my $ACLObj =
RT::ACL->new
($session{'CurrentUser'});
+ my $ACE =
RT::ACE->new
($session{'CurrentUser'});
$ACLObj->LimitToObject( $Object);
$ACLObj->LimitToPrincipal( Id => $PrincipalId);
$ACLObj->OrderBy(FIELD=>'RightName');
$ACLObj->LimitToObject( $Object);
$ACLObj->LimitToPrincipal( Id => $PrincipalId);
$ACLObj->OrderBy(FIELD=>'RightName');
- if (ref($Object) && UNIVERSAL::can($Object, 'AvailableRights')) {
+ eval {
%Rights = %{$Object->AvailableRights};
%Rights = %{$Object->AvailableRights};
- }
-
- else {
- %Rights = ( loc('System Error') => loc("No rights found") );
- }
+ };
+ if ($@) {
+ %Rights = ( loc('System Error') => loc("No rights found") );
+ }
$ACLDesc = "$PrincipalId-".ref($Object)."-".$Object->Id;
</%INIT>
$ACLDesc = "$PrincipalId-".ref($Object)."-".$Object->Id;
</%INIT>