[freeside-commits] branch master updated. 5665dc8243598e7ca6567719b6e91efcfbbea209

[Christopher Burger]

The branch, master has been updated
       via  5665dc8243598e7ca6567719b6e91efcfbbea209 (commit)
      from  1043f465a4c6a1ab94df2e22823a2a688e102bcd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5665dc8243598e7ca6567719b6e91efcfbbea209
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Aug 1 13:53:42 2017 -0400

    RT # 73490 - removed global conf and user pref check for hide tickets and added group access control.

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 9649e5e..6b2dc4a 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -362,6 +362,10 @@ tie my %rights, 'Tie::IxHash',
     { rightname=>'Employee preference telephony integration' },
   #]
 
+  #'RT preference rights' => [
+    { rightname=>'not an RT' },
+  #]
+
   ],
   
   ###
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index a0b9a9c..d41cc74 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -5305,13 +5305,6 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'rt-hide_activity_notification',
-    'section'     => 'ticketing',
-    'description' => 'Hide the notification box when there is activity on tickets',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'pkg-balances',
     'section'     => 'packages',
     'description' => 'Enable per-package balances.',
diff --git a/httemplate/elements/notify-tickets.html b/httemplate/elements/notify-tickets.html
index b545063..ce367de 100644
--- a/httemplate/elements/notify-tickets.html
+++ b/httemplate/elements/notify-tickets.html
@@ -13,12 +13,8 @@
 <%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');
+$enabled = 0 if $FS::CurrentUser::CurrentUser->access_right('not an RT');
 my $UnrepliedTickets;
 if ($enabled) {
   my $class = 'RT::Search::UnrepliedTickets';
diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html
index a87036b..75e5795 100644
--- a/httemplate/pref/pref-process.html
+++ b/httemplate/pref/pref-process.html
@@ -56,7 +56,6 @@ unless ( $error ) { # if ($access_user) {
                       enable_mask_clipboard_hack dashboard_customers
                       customer_view_emails
                       printtofit
-                      hide_notify_tickets
                       email_address
                       snom-ip snom-username snom-password
                       vonage-fromnumber vonage-username vonage-password
diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html
index bb21b0f..abd1ea5 100644
--- a/httemplate/pref/pref.html
+++ b/httemplate/pref/pref.html
@@ -137,13 +137,6 @@
   </TR>
 
   <TR>
-    <TH ALIGN="right"><% emt('Hide notification of new ticket activity') %></TH>
-    <TD ALIGN="left">
-      <INPUT TYPE="checkbox" NAME="hide_notify_tickets" VALUE="1" <% $curuser->option('hide_notify_tickets') ? 'CHECKED' : '' %>>
-    </TD>
-  </TR>
-
-  <TR>
     <TH ALIGN="right"><% emt("How many recently-modified customers displayed on dashboard") %></TH>
     <TD ALIGN="left" COLSPAN=2>
       <INPUT TYPE="text" NAME="dashboard_customers" VALUE="<% $curuser->option('dashboard_customers') %>"></TD>

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/AccessRight.pm                    |    4 ++++
 FS/FS/Conf.pm                           |    7 -------
 httemplate/elements/notify-tickets.html |    6 +-----
 httemplate/pref/pref-process.html       |    1 -
 httemplate/pref/pref.html               |    7 -------
 5 files changed, 5 insertions(+), 20 deletions(-)