diff options
author | Christopher Burger <burgerc@freeside.biz> | 2017-08-01 13:53:42 -0400 |
---|---|---|
committer | Christopher Burger <burgerc@freeside.biz> | 2017-08-16 11:55:58 -0400 |
commit | 403aa327f1b10b37dcac39f6cf6ab1f89dcef7f6 (patch) | |
tree | 5d8ed21f86b8e975e5081260af9ddc8175b1740a | |
parent | af965b6e50e539c74dfede0ced874e2a103d42eb (diff) |
RT # 73490 - removed global conf and user pref check for hide tickets and added group access control.
-rw-r--r-- | FS/FS/AccessRight.pm | 4 | ||||
-rw-r--r-- | FS/FS/Conf.pm | 7 | ||||
-rw-r--r-- | httemplate/elements/notify-tickets.html | 6 | ||||
-rw-r--r-- | httemplate/pref/pref-process.html | 1 | ||||
-rw-r--r-- | httemplate/pref/pref.html | 7 |
5 files changed, 5 insertions, 20 deletions
diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm index 287d054..301544f 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 3053d78..b5b5ec8 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -5340,13 +5340,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> |