diff options
| author | ivan <ivan> | 2011-12-09 01:02:03 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-12-09 01:02:03 +0000 |
| commit | c38702f0a0e02e7ed45c8cb8dad86cd1a1ee4882 (patch) | |
| tree | a6f4af7184639cb2ae8c7ea4fa6b7b433c080355 | |
| parent | dbfa77932f2c2652a047745c3923c947d4a2722a (diff) | |
Add "View email logs" ACL - "View customers of all agents" was definitely not the right ACL there
| -rw-r--r-- | FS/FS/AccessRight.pm | 1 | ||||
| -rw-r--r-- | httemplate/elements/menu.html | 2 | ||||
| -rw-r--r-- | httemplate/search/cust_msg.html | 2 | ||||
| -rwxr-xr-x | httemplate/view/cust_msg.html | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm index 7351c6d7f..1bfae03ad 100644 --- a/FS/FS/AccessRight.pm +++ b/FS/FS/AccessRight.pm @@ -264,6 +264,7 @@ tie my %rights, 'Tie::IxHash', 'Receivables report', 'Financial reports', { rightname=> 'List inventory', global=>1 }, + { rightname=>'View email logs', global=>1 }, #{ rightname => 'List customers of all agents', global=>1 }, ], diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index 48270da36..df97a5e18 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -413,7 +413,7 @@ $tools_menu{'Time Queue'} = [ $fsurl.'search/report_timeworked.html', 'View pen $tools_menu{'Attachments'} = [ $fsurl.'browse/cust_attachment.html', 'View customer attachments' ] if !$conf->config('disable_cust_attachment') and $curuser->access_right('View attachments') and $curuser->access_right('Browse attachments'); $tools_menu{'Outgoing messages'} = [ $fsurl.'search/cust_msg.html', 'View outgoing message log' ] #shouldn't this be in the reports menu? - if $curuser->access_right('Configuration'); + if $curuser->access_right('View email logs'); $tools_menu{'Importing'} = [ \%tools_importing, 'Import tools' ] if $curuser->access_right('Import'); $tools_menu{'Exporting'} = [ \%tools_exporting, 'Export tools' ] diff --git a/httemplate/search/cust_msg.html b/httemplate/search/cust_msg.html index 64fae30bd..f71a86607 100644 --- a/httemplate/search/cust_msg.html +++ b/httemplate/search/cust_msg.html @@ -41,7 +41,7 @@ <%init> #hmm... die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('View customers of all agents'); + unless $FS::CurrentUser::CurrentUser->access_right('View email logs'); my $conf = new FS::Conf; diff --git a/httemplate/view/cust_msg.html b/httemplate/view/cust_msg.html index a5846109a..d5ec036dc 100755 --- a/httemplate/view/cust_msg.html +++ b/httemplate/view/cust_msg.html @@ -38,7 +38,7 @@ readonly=1 cols=80 rows=20> <%init> my $curuser = $FS::CurrentUser::CurrentUser; -die "access denied" if !$curuser->access_right('View customers of all agents'); +die "access denied" if !$curuser->access_right('View email logs'); my ($custmsgnum) = $cgi->keywords; $custmsgnum =~ /^(\d+)$/ or die "illegal custmsgnum"; |