From: ivan Date: Fri, 29 Mar 2002 17:27:18 +0000 (+0000) Subject: fix unlinked svc browse! X-Git-Tag: freeside_1_4_0_pre12~114 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=12fca9ac80c2b0444a7916506f6e2a8fa98bc24d fix unlinked svc browse! --- diff --git a/htetc/global.asa b/htetc/global.asa index 94d6b7e3e..48d0d6fcd 100644 --- a/htetc/global.asa +++ b/htetc/global.asa @@ -10,7 +10,7 @@ use IO::Handle; use IO::File; use String::Approx qw(amatch); use HTML::Widgets::SelectLayers; -use FS::UID qw(cgisuidsetup dbh getotaker datasrc); +use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); use FS::Record qw(qsearch qsearchs fields dbdef); use FS::Conf; use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot diff --git a/htetc/handler.pl b/htetc/handler.pl index 8e097c656..1a746a552 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -67,7 +67,7 @@ sub handler use IO::File; use String::Approx qw(amatch); use HTML::Widgets::SelectLayers; - use FS::UID qw(cgisuidsetup dbh getotaker datasrc); + use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); use FS::Record qw(qsearch qsearchs fields dbdef); use FS::Conf; use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi index daf025a38..e28e00e61 100755 --- a/httemplate/search/svc_acct.cgi +++ b/httemplate/search/svc_acct.cgi @@ -21,13 +21,14 @@ $query ||= ''; #to avoid use of unitialized value errors my $unlinked = ''; if ( $query =~ /^UN_(.*)$/ ) { $query = $1; - $unlinked = ' + my $empty = driver_name =~ /^Pg$/i ? qq('') : qq(""); + $unlinked = " WHERE 0 < ( SELECT count(*) FROM cust_svc WHERE cust_svc.svcnum = svc_acct.svcnum - AND pkgnum IS NULL + AND ( pkgnum IS NULL OR pkgnum = 0 OR pkgnum = $empty ) ) - '; + "; } my(@svc_acct, $sortby);