projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d632cda
)
fix svc_port searches
author
ivan
<ivan>
Thu, 2 Jun 2011 21:52:57 +0000
(21:52 +0000)
committer
ivan
<ivan>
Thu, 2 Jun 2011 21:52:57 +0000
(21:52 +0000)
FS/FS/svc_port.pm
patch
|
blob
|
history
httemplate/search/cust_svc.html
patch
|
blob
|
history
diff --git
a/FS/FS/svc_port.pm
b/FS/FS/svc_port.pm
index
7dc70f9
..
a0252b4
100644
(file)
--- a/
FS/FS/svc_port.pm
+++ b/
FS/FS/svc_port.pm
@@
-80,7
+80,8
@@
sub table_info {
'name' => 'Port',
#'name_plural' => 'Ports', #optional,
#'longname_plural' => 'Ports', #optional
'name' => 'Port',
#'name_plural' => 'Ports', #optional,
#'longname_plural' => 'Ports', #optional
- 'sorts' => [ 'svcnum', 'serviceid' ], # optional sort field (or arrayref of sort fields, main first)
+ #'sorts' => [ 'svcnum', 'serviceid' ], # optional sort field (or arrayref of sort fields, main first)
+ 'sorts' => [ 'serviceid' ], # optional sort field (or arrayref of sort fields, main first)
'display_weight' => 75,
'cancel_weight' => 10,
'fields' => {
'display_weight' => 75,
'cancel_weight' => 10,
'fields' => {
diff --git
a/httemplate/search/cust_svc.html
b/httemplate/search/cust_svc.html
index
72ecb8e
..
9cf4bbd
100644
(file)
--- a/
httemplate/search/cust_svc.html
+++ b/
httemplate/search/cust_svc.html
@@
-75,6
+75,7
@@
if ( length( $cgi->param('search_svc') ) ) {
$cgi->param('svcdb') =~ /^(svc_\w+)$/ or die "unknown svcdb";
push @extra_sql, "svcdb = '$1'";
$cgi->param('svcdb') =~ /^(svc_\w+)$/ or die "unknown svcdb";
push @extra_sql, "svcdb = '$1'";
+ $addl_from .= " LEFT JOIN $1 USING ( svcnum ) ";
push @extra_sql, 'pkgnum IS NULL'
if $cgi->param('magic') eq 'unlinked';
push @extra_sql, 'pkgnum IS NULL'
if $cgi->param('magic') eq 'unlinked';