projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#39481: Password Maximum Length
[freeside.git]
/
httemplate
/
search
/
svc_broadband.cgi
diff --git
a/httemplate/search/svc_broadband.cgi
b/httemplate/search/svc_broadband.cgi
index
403396b
..
8561977
100755
(executable)
--- a/
httemplate/search/svc_broadband.cgi
+++ b/
httemplate/search/svc_broadband.cgi
@@
-1,4
+1,4
@@
-<
% include( 'elements/search.html'
,
+<
& elements/svc_Common.html
,
'title' => 'Broadband Search Results',
'name' => 'broadband services',
'html_init' => $html_init,
'title' => 'Broadband Search Results',
'name' => 'broadband services',
'html_init' => $html_init,
@@
-8,31
+8,36
@@
'header' => [ '#',
'Service',
'Router',
'header' => [ '#',
'Service',
'Router',
+ @tower_header,
'IP Address',
FS::UI::Web::cust_header($cgi->param('cust_fields')),
],
'fields' => [ 'svcnum',
'svc',
sub {
'IP Address',
FS::UI::Web::cust_header($cgi->param('cust_fields')),
],
'fields' => [ 'svcnum',
'svc',
sub {
- my $
blocknum = shift->blocknum or return '';
- $router
byblock{$blocknum}->routername
;
+ my $
router = shift->router;
+ $router
? $router->routername : ''
;
},
},
+ @tower_fields,
'ip_addr',
\&FS::UI::Web::cust_fields,
],
'links' => [ $link,
$link,
'', #$link_router,
'ip_addr',
\&FS::UI::Web::cust_fields,
],
'links' => [ $link,
$link,
'', #$link_router,
+ (map '', @tower_fields),
$link,
( map { $_ ne 'Cust. Status' ? $link_cust : '' }
FS::UI::Web::cust_header($cgi->param('cust_fields'))
),
],
$link,
( map { $_ ne 'Cust. Status' ? $link_cust : '' }
FS::UI::Web::cust_header($cgi->param('cust_fields'))
),
],
- 'align' => 'rllr'. FS::UI::Web::cust_aligns(),
+ 'align' => 'rll'.('r' x @tower_fields).'r'.
+ FS::UI::Web::cust_aligns(),
'color' => [
'',
'',
'',
'color' => [
'',
'',
'',
+ (map '', @tower_fields),
'',
FS::UI::Web::cust_colors(),
],
'',
FS::UI::Web::cust_colors(),
],
@@
-40,11
+45,12
@@
'',
'',
'',
'',
'',
'',
+ (map '', @tower_fields),
'',
FS::UI::Web::cust_styles(),
],
'',
FS::UI::Web::cust_styles(),
],
- )
-
%
>
+
+
&
>
<%init>
die "access denied" unless
<%init>
die "access denied" unless
@@
-55,22
+61,29
@@
my $conf = new FS::Conf;
my %search_hash;
if ( $cgi->param('magic') eq 'unlinked' ) {
%search_hash = ( 'unlinked' => 1 );
my %search_hash;
if ( $cgi->param('magic') eq 'unlinked' ) {
%search_hash = ( 'unlinked' => 1 );
-}
-else {
- foreach (qw(custnum agentnum svcpart)) {
+} else {
+ foreach (qw( custnum agentnum svcpart cust_fields )) {
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
- foreach (qw(pkgpart routernum)) {
+ foreach (qw(pkgpart routernum
towernum sectornum
)) {
$search_hash{$_} = [ $cgi->param($_) ] if $cgi->param($_);
}
}
if ( $cgi->param('sortby') =~ /^(\w+)$/ ) {
$search_hash{$_} = [ $cgi->param($_) ] if $cgi->param($_);
}
}
if ( $cgi->param('sortby') =~ /^(\w+)$/ ) {
- $search_hash{'order_by'} =
$1
;
+ $search_hash{'order_by'} =
"ORDER BY $1"
;
}
my $sql_query = FS::svc_broadband->search(\%search_hash);
}
my $sql_query = FS::svc_broadband->search(\%search_hash);
+my @tower_header;
+my @tower_fields;
+if ( FS::tower_sector->count > 0 ) {
+ push @tower_header, 'Tower/Sector';
+ push @tower_fields, sub { $_[0]->tower_sector ?
+ $_[0]->tower_sector->description : '' };
+}
+
my %routerbyblock = ();
foreach my $router (qsearch('router', {})) {
foreach ($router->addr_block) {
my %routerbyblock = ();
foreach my $router (qsearch('router', {})) {
foreach ($router->addr_block) {