diff options
author | ivan <ivan> | 2010-06-17 02:08:53 +0000 |
---|---|---|
committer | ivan <ivan> | 2010-06-17 02:08:53 +0000 |
commit | 8966833a87b9a002c9d72c56832e35b55628dc81 (patch) | |
tree | 5ebe5128d453eb940580b1876b2218d1db8d87be /FS | |
parent | 259921ee5e89a68fc79b2a358643c558ebb4fdaa (diff) |
Add "View customers of all agents" access rights, RT#7010
Diffstat (limited to 'FS')
-rw-r--r-- | FS/FS/AccessRight.pm | 6 | ||||
-rw-r--r-- | FS/FS/access_user.pm | 30 |
2 files changed, 24 insertions, 12 deletions
diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm index 08d31d2..1e1b9ea 100644 --- a/FS/FS/AccessRight.pm +++ b/FS/FS/AccessRight.pm @@ -115,6 +115,7 @@ tie my %rights, 'Tie::IxHash', { rightname=>'Delete customer', desc=>"Enable customer deletions. Be very careful! Deleting a customer will remove all traces that this customer ever existed! It should probably only be used when auditing a legacy database. Normally, you cancel all of a customer's packages if they cancel service." }, #aka. deletecustomers 'Bill customer now', #NEW 'Bulk send customer notices', #NEW + { rightname=>'View customers of all agents', global=>1 }, ], ### @@ -249,6 +250,8 @@ tie my %rights, 'Tie::IxHash', 'Billing event reports', 'Receivables report', 'Financial reports', + + #{ rightname => 'List customers of all agents', global=>1 }, ], ### @@ -294,6 +297,9 @@ tie my %rights, 'Tie::IxHash', { rightname=>'Broadband configuration' }, { rightname=>'Broadband global configuration', global=>1 }, + #{ rightname=>'Edit employees', global=>1, }, + #{ rightname=>'Edit employee groupss', global=>1, }, + { rightname=>'Configuration', global=>1 }, #most of the rest of the configuraiton is not agent-virtualized { rightname=>'Configuration download', }, #description of how it affects diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm index 1bf6e93..25aa8af 100644 --- a/FS/FS/access_user.pm +++ b/FS/FS/access_user.pm @@ -1,20 +1,16 @@ package FS::access_user; use strict; -use vars qw( @ISA $DEBUG $me $conf $htpasswd_file ); +use base qw( FS::m2m_Common FS::option_Common ); +use vars qw( $DEBUG $me $conf $htpasswd_file ); use FS::UID; use FS::Conf; use FS::Record qw( qsearch qsearchs dbh ); -use FS::m2m_Common; -use FS::option_Common; use FS::access_user_pref; use FS::access_usergroup; use FS::agent; use FS::cust_main; -@ISA = qw( FS::m2m_Common FS::option_Common FS::Record ); -#@ISA = qw( FS::m2m_Common FS::option_Common ); - $DEBUG = 0; $me = '[FS::access_user]'; @@ -367,6 +363,11 @@ user has the provided access right Optional table name in which agentnum is being checked. Sometimes required to resolve 'column reference "agentnum" is ambiguous' errors. +=item viewall_right + +All agents will be viewable if the current user has the provided access right. +Defaults to 'View customers of all agents'. + =back =cut @@ -377,16 +378,21 @@ sub agentnums_sql { my $agentnum = $opt{'table'} ? $opt{'table'}.'.agentnum' : 'agentnum'; -# my @agentnums = map { "$agentnum = $_" } $self->agentnums; - my @agentnums = (); - push @agentnums, "$agentnum IN (". join(',', $self->agentnums). ')'; + my @or = (); + + my $viewall_right = $opt{'viewall_right'} || 'View customers of all agents'; + if ( $self->access_right($viewall_right) ) { + push @or, "$agentnum IS NOT NULL"; + } else { + push @or, "$agentnum IN (". join(',', $self->agentnums). ')'; + } - push @agentnums, "$agentnum IS NULL" + push @or, "$agentnum IS NULL" if $opt{'null'} || ( $opt{'null_right'} && $self->access_right($opt{'null_right'}) ); - return ' 1 = 0 ' unless scalar(@agentnums); - '( '. join( ' OR ', @agentnums ). ' )'; + return ' 1 = 0 ' unless scalar(@or); + '( '. join( ' OR ', @or ). ' )'; } |