X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Frouter.cgi;h=72111ca57a4b96510e20fbf9784044e1270f688a;hb=1a320aa8f679a355bd3678ccceb5d7ecf7b0aeba;hp=fdcd7b3b34771557b2bcbbe8a523d2a638ce0ec5;hpb=e5fcc68aab310814b0ba5444bc97ef504e6e16da;p=freeside.git
diff --git a/httemplate/edit/router.cgi b/httemplate/edit/router.cgi
index fdcd7b3b3..72111ca57 100755
--- a/httemplate/edit/router.cgi
+++ b/httemplate/edit/router.cgi
@@ -7,7 +7,13 @@
'routername' => 'Name',
'svc_part' => 'Service',
'agentnum' => 'Agent',
- 'manual_addr' => 'Assign IP addresses manually',
+ 'manual_addr' => '
+ Assign IP addresses manually
+
+ Uncheck to assign IP address
+ from router/address block
+
+ ',
},
'fields' => [
{ 'field'=>'routername', 'type'=>'text', 'size'=>32 },
@@ -29,19 +35,26 @@ die "access denied"
unless $curuser->access_right('Broadband configuration')
|| $curuser->access_right('Broadband global configuration');
+my @svc_x = 'svc_broadband';
+if ( FS::Conf->new->exists('svc_acct-ip_addr') ) {
+ push @svc_x, 'svc_acct';
+}
+
my $callback = sub {
my ($cgi, $object, $fields) = (shift, shift, shift);
+
+ my $extra_sql = ' AND svcdb IN(' . join(',', map { "'$_'" } @svc_x) . ')';
unless ($object->svcnum) {
push @{$fields},
{ 'type' => 'tablebreak-tr-title',
'value' => 'Select the service types available on this router',
},
- { 'field' => 'svc_part',
- 'type' => 'checkboxes-table',
+ { 'type' => 'checkboxes-table',
'target_table' => 'part_svc',
'link_table' => 'part_svc_router',
'name_col' => 'svc',
- 'hashref' => { 'svcdb' => 'svc_broadband', 'disabled' => '' },
+ 'hashref' => { 'disabled' => '' },
+ 'extra_sql' => $extra_sql,
};
}
};