Abstract RT::Ticket::RoleAddresses so it can be used for assets too.

2 files changed, 19 insertions, 20 deletions

diff --git a/lib/RT/Record/Role/Roles.pm b/lib/RT/Record/Role/Roles.pm
index 25179a8fc6..f865d1258e 100644
--- a/lib/RT/Record/Role/Roles.pm
+++ b/lib/RT/Record/Role/Roles.pm
@@ -877,4 +877,22 @@ sub CustomRoleObj {
     return undef;
 }
 
+
+=head2 RoleAddresses
+
+Takes a role name and returns a string of all the email addresses for
+users in that role.
+
+=cut
+
+sub RoleAddresses {
+    my $self = shift;
+    my $role = shift;
+
+    if ( $self->CurrentUserCanSee ) {
+        return $self->RoleGroup($role)->MemberEmailAddressesAsString;
+    }
+    return undef;
+}
+
 1;
diff --git a/lib/RT/Ticket.pm b/lib/RT/Ticket.pm
index d63881f79e..b609eea085 100644
--- a/lib/RT/Ticket.pm
+++ b/lib/RT/Ticket.pm
@@ -830,25 +830,6 @@ sub CcAddresses {
     return $self->RoleAddresses('Cc');
 }
 
-=head2 RoleAddresses
-
-Takes a role name and returns a string of all the email addresses for
-users in that role
-
-=cut
-
-sub RoleAddresses {
-    my $self = shift;
-    my $role = shift;
-
-    unless ( $self->CurrentUserHasRight('ShowTicket') ) {
-        return undef;
-    }
-    return ( $self->RoleGroup($role)->MemberEmailAddressesAsString);
-}
-
-
-
 =head2 Requestor
 
 Takes nothing.
@@ -3002,7 +2983,7 @@ sub CurrentUserCanSee {
     my ($what, $txn) = @_;
     return 0 unless $self->CurrentUserHasRight('ShowTicket');
 
-    return 1 if $what ne "Transaction";
+    return 1 if ( $what // '' ) ne "Transaction";
 
     # If it's a comment, we need to be extra special careful
     my $type = $txn->__Value('Type');