diff options
author | ivan <ivan> | 2006-08-11 08:02:26 +0000 |
---|---|---|
committer | ivan <ivan> | 2006-08-11 08:02:26 +0000 |
commit | e47e9758f480c664bfc3917d798cd69c7d354999 (patch) | |
tree | e776a5753a1214a797731f4da39518979f1400eb /FS | |
parent | dbc120189697e8306f62349c310f5410f8382491 (diff) |
virtualize referrals on customer addition
Diffstat (limited to 'FS')
-rw-r--r-- | FS/FS/access_user.pm | 16 | ||||
-rw-r--r-- | FS/FS/part_referral.pm | 21 |
2 files changed, 30 insertions, 7 deletions
diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm index f32fa3a23..830d7f826 100644 --- a/FS/FS/access_user.pm +++ b/FS/FS/access_user.pm @@ -5,6 +5,7 @@ use vars qw( @ISA $htpasswd_file ); use FS::Record qw( qsearch qsearchs dbh ); use FS::m2m_Common; use FS::access_usergroup; +use FS::agent; @ISA = qw( FS::m2m_Common FS::Record ); @@ -318,6 +319,21 @@ sub agentnum { $sth->fetchrow_arrayref->[0]; } +=item agents + +Returns the list of agents this user can view (via group membership), as +FS::agent objects. + +=cut + +sub agents { + my $self = shift; + qsearch({ + 'table' => 'agent', + 'hashref' => { disabled=>'' }, + 'extra_sql' => ' AND '. $self->agentnums_sql, + }); +} =item access_right diff --git a/FS/FS/part_referral.pm b/FS/FS/part_referral.pm index e1688650d..87bc87cba 100644 --- a/FS/FS/part_referral.pm +++ b/FS/FS/part_referral.pm @@ -124,30 +124,37 @@ sub agent { =over 4 -=item acl_agentnum_sql +=item acl_agentnum_sql [ INCLUDE_GLOBAL_BOOL ] Returns an SQL fragment for searching for part_referral records allowed by the current users's agent ACLs (and "Edit global advertising sources" right). +Pass a true value to include global advertising sources (for example, when +simply using rather than editing advertising sources). + =cut sub acl_agentnum_sql { - #my $class = shift; + my $self = shift; my $curuser = $FS::CurrentUser::CurrentUser; my $sql = $curuser->agentnums_sql; $sql = " ( $sql OR agentnum IS NULL ) " - if $curuser->access_right('Edit global advertising sources'); + if $curuser->access_right('Edit global advertising sources') + or defined($_[0]) && $_[0]; $sql; } -=item all_part_referral +=item all_part_referral [ INCLUDE_GLOBAL_BOOL ] Returns all part_referral records allowed by the current users's agent ACLs (and "Edit global advertising sources" right). +Pass a true value to include global advertising sources (for example, when +simply using rather than editing advertising sources). + =cut sub all_part_referral { @@ -155,12 +162,12 @@ sub all_part_referral { qsearch({ 'table' => 'part_referral', - 'extra_sql' => ' WHERE '. $self->acl_agentnum_sql. ' ORDER BY refnum ', + 'extra_sql' => ' WHERE '. $self->acl_agentnum_sql(@_). ' ORDER BY refnum ', }); } -=item num_part_referral +=item num_part_referral [ INCLUDE_GLOBAL_BOOL ] Returns the number of part_referral records allowed by the current users's agent ACLs (and "Edit global advertising sources" right). @@ -171,7 +178,7 @@ sub num_part_referral { my $self = shift; my $sth = dbh->prepare( - 'SELECT COUNT(*) FROM part_referral WHERE '. $self->acl_agentnum_sql + 'SELECT COUNT(*) FROM part_referral WHERE '. $self->acl_agentnum_sql(@_) ) or die dbh->errstr; $sth->execute() or die $sth->errstr; $sth->fetchrow_arrayref->[0]; |