X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fnotify-tickets.html;h=35917c34d9d0fcd6c1106984504969b019e5e751;hb=60cad42d5098f9d55d9215e3d87a234eaaa7dc2e;hp=faf998e2b12d8ea93e2829d62f47c7e7082966e4;hpb=8e8a3366427d115536f547c688c371f9c22302ce;p=freeside.git diff --git a/httemplate/elements/notify-tickets.html b/httemplate/elements/notify-tickets.html index faf998e2b..35917c34d 100644 --- a/httemplate/elements/notify-tickets.html +++ b/httemplate/elements/notify-tickets.html @@ -1,13 +1,4 @@ % if ($enabled) { -
% if ( $UnrepliedTickets->Count > 0 ) { @@ -23,14 +14,26 @@ use Class::Load 'load_class'; my $enabled = $FS::TicketSystem::system eq 'RT_Internal'; +$enabled = 0 if $FS::CurrentUser::CurrentUser->option('hide_notify_tickets'); my $UnrepliedTickets; if ($enabled) { my $class = 'RT::Search::UnrepliedTickets'; load_class($class); - my $session = FS::TicketSystem->session; - my $CurrentUser = $session->{CurrentUser}; - $UnrepliedTickets = RT::Tickets->new($CurrentUser); - my $search = $class->new(TicketsObj => $UnrepliedTickets); - $search->Prepare; + my $session = eval { FS::TicketSystem->session; }; + if ( $session ) { + my $CurrentUser = $session->{CurrentUser}; + # if there are no tickets the current user could see, always hide it + my $AnyTickets = RT::Tickets->new($CurrentUser); + foreach my $status (qw(resolved rejected deleted)) { + $AnyTickets->LimitStatus( OPERATOR => '!=', VALUE => $status ); + } + $enabled = 0 if $AnyTickets->Count == 0; + + $UnrepliedTickets = RT::Tickets->new($CurrentUser); + my $search = $class->new(TicketsObj => $UnrepliedTickets); + $search->Prepare; + } else { + $enabled = 0; + } }