[freeside-commits] branch FREESIDE_3_BRANCH updated. 58f7ac18d2f510c2332fcb9d3b66b718852d186f

Mark Wells mark at 420.am
Fri May 31 15:36:48 PDT 2013


The branch, FREESIDE_3_BRANCH has been updated
       via  58f7ac18d2f510c2332fcb9d3b66b718852d186f (commit)
      from  e13ea63b001ea6867af06530c2add5a093451d12 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 58f7ac18d2f510c2332fcb9d3b66b718852d186f
Author: Mark Wells <mark at freeside.biz>
Date:   Fri May 31 15:36:31 2013 -0700

    service smart search, #23297, fallout from #22385

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 6274107..94f04e9 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -890,7 +890,8 @@ sub smart_search_param {
   (
     'table'     => 'cust_svc',
     'select'    => 'svc_all.svcnum AS svcnum, '.
-                   'COALESCE(svc_all.svcdb, part_svc.svcdb) AS svcdb',
+                   'COALESCE(svc_all.svcdb, part_svc.svcdb) AS svcdb, '.
+                   'cust_svc.*',
     'addl_from' => $addl_from,
     'hashref'   => {},
     'extra_sql' => $extra_sql,
diff --git a/httemplate/search/cust_svc.html b/httemplate/search/cust_svc.html
index b245d31..6fa9390 100644
--- a/httemplate/search/cust_svc.html
+++ b/httemplate/search/cust_svc.html
@@ -47,8 +47,8 @@ die "access denied"
 
 my $sql_query;
 
-my $orderby = 'ORDER BY svcnum'; #has to be ordered by something
-                                 #for pagination to work
+my $orderby = 'ORDER BY cust_svc.svcnum'; #has to be ordered by something
+                                          #for pagination to work
 
 if ( length( $cgi->param('search_svc') ) ) {
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_svc.pm               |    3 ++-
 httemplate/search/cust_svc.html |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)




More information about the freeside-commits mailing list