projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cf10627
)
1.7 has no per_agent config
author
ivan
<ivan>
Mon, 14 Dec 2009 07:48:46 +0000
(07:48 +0000)
committer
ivan
<ivan>
Mon, 14 Dec 2009 07:48:46 +0000
(07:48 +0000)
FS/FS/Conf.pm
patch
|
blob
|
history
FS/FS/svc_acct.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Conf.pm
b/FS/FS/Conf.pm
index
1bc5860
..
d4376c3
100644
(file)
--- a/
FS/FS/Conf.pm
+++ b/
FS/FS/Conf.pm
@@
-2247,7
+2247,6
@@
worry that config_items is freeside-specific and icky.
'section' => '',
'description' => 'RADIUS group (or comma-separated groups) to assign to svc_acct which has exceeded its bandwidth or time limit.',
'type' => 'text',
'section' => '',
'description' => 'RADIUS group (or comma-separated groups) to assign to svc_acct which has exceeded its bandwidth or time limit.',
'type' => 'text',
- 'per_agent' => 1,
},
{
},
{
diff --git
a/FS/FS/svc_acct.pm
b/FS/FS/svc_acct.pm
index
fda6e3c
..
7b13919
100644
(file)
--- a/
FS/FS/svc_acct.pm
+++ b/
FS/FS/svc_acct.pm
@@
-1805,14
+1805,11
@@
sub _op_overlimit {
my $cust_pkg = $self->cust_svc->cust_pkg;
my $cust_pkg = $self->cust_svc->cust_pkg;
- my $agent_overlimit =
- $cust_pkg
- ? $conf->config('overlimit_groups', $cust_pkg->cust_main->agentnum )
- : '';
+ my $conf_overlimit = $conf->config('overlimit_groups');
foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
- my $groups = $
agent
_overlimit || $part_export->option('overlimit_groups');
+ my $groups = $
conf
_overlimit || $part_export->option('overlimit_groups');
next unless $groups;
my $gref = &{ $self->_fieldhandlers->{'usergroup'} }( $self, $groups );
next unless $groups;
my $gref = &{ $self->_fieldhandlers->{'usergroup'} }( $self, $groups );