projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ab8fb59
)
RT # 73490 - removed global conf and user pref check for hide tickets and added group...
author
Christopher Burger
<burgerc@freeside.biz>
Tue, 1 Aug 2017 17:53:42 +0000
(13:53 -0400)
committer
Christopher Burger
<burgerc@freeside.biz>
Wed, 16 Aug 2017 16:27:19 +0000
(12:27 -0400)
FS/FS/AccessRight.pm
patch
|
blob
|
history
FS/FS/Conf.pm
patch
|
blob
|
history
httemplate/elements/notify-tickets.html
patch
|
blob
|
history
httemplate/pref/pref-process.html
patch
|
blob
|
history
httemplate/pref/pref.html
patch
|
blob
|
history
diff --git
a/FS/FS/AccessRight.pm
b/FS/FS/AccessRight.pm
index
ededf9e
..
40b5b37
100644
(file)
--- a/
FS/FS/AccessRight.pm
+++ b/
FS/FS/AccessRight.pm
@@
-362,6
+362,10
@@
tie my %rights, 'Tie::IxHash',
{ rightname=>'Employee preference telephony integration' },
#]
{ 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
967468b
..
77add5d
100644
(file)
--- a/
FS/FS/Conf.pm
+++ b/
FS/FS/Conf.pm
@@
-5619,13
+5619,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' => 'billing',
'description' => 'Enable per-package balances.',
'key' => 'pkg-balances',
'section' => 'billing',
'description' => 'Enable per-package balances.',
diff --git
a/httemplate/elements/notify-tickets.html
b/httemplate/elements/notify-tickets.html
index
0c37074
..
aebbef6
100644
(file)
--- a/
httemplate/elements/notify-tickets.html
+++ b/
httemplate/elements/notify-tickets.html
@@
-13,12
+13,8
@@
<%init>
use Class::Load 'load_class';
<%init>
use Class::Load 'load_class';
-use FS::Conf;
-my $conf = new FS::Conf;
-
my $enabled = $FS::TicketSystem::system eq 'RT_Internal';
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';
my $UnrepliedTickets;
if ($enabled) {
my $class = 'RT::Search::UnrepliedTickets';
diff --git
a/httemplate/pref/pref-process.html
b/httemplate/pref/pref-process.html
index
0134e6a
..
f5b5bb6
100644
(file)
--- 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
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
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
bf0cc90
..
d976871
100644
(file)
--- a/
httemplate/pref/pref.html
+++ b/
httemplate/pref/pref.html
@@
-150,13
+150,6
@@
Interface
</TR>
<TR>
</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>
<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>