X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fnotify-tickets.html;h=b545063381908422fa1e51ac55326516c5f50599;hb=09a43bd0984104796052ceee7fdae0581612535d;hp=faf998e2b12d8ea93e2829d62f47c7e7082966e4;hpb=d22baa4e71bfa9e153c1fe1152ff4c748f1d935c;p=freeside.git

diff --git a/httemplate/elements/notify-tickets.html b/httemplate/elements/notify-tickets.html
index faf998e2b..b54506338 100644
--- a/httemplate/elements/notify-tickets.html
+++ b/httemplate/elements/notify-tickets.html
@@ -1,13 +1,4 @@
 % if ($enabled) {
-<style>
-.dot {
-  border-radius: 50%;
-  border: 1px solid black;
-  width: 1ex;
-  height: 1ex;
-  display: inline-block;
-}
-</style>
 <div style="font-weight: bold; vertical-align: bottom; text-align: left">
 %   if ( $UnrepliedTickets->Count > 0 ) {
   <a href="<% $fsurl %>rt/Search/UnrepliedTickets.html">
@@ -22,15 +13,31 @@
 <%init>
 use Class::Load 'load_class';
 
+use FS::Conf;
+my $conf = new FS::Conf;
+
 my $enabled = $FS::TicketSystem::system eq 'RT_Internal';
+$enabled = 0 if $FS::CurrentUser::CurrentUser->option('hide_notify_tickets');
+$enabled = 0 if $conf->exists('rt-hide_activity_notification');
 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;
+  }
 }
 </%init>